diff options
136 files changed, 16090 insertions, 6909 deletions
@@ -0,0 +1,9 @@ + +DDTP problems: +-------------- +- apt-get update clean the /var/lib/apt/lists dir + from all Translation-$index that are not in the current + enviroment or Translations apt variable +- there needs to be a list of locales (pt, sv, en) that need + both language and country code to get the right file + (is in the code in indexfile::LanguageCode(), just a bit ugly @@ -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/README.ddtp b/README.ddtp new file mode 100644 index 000000000..98f6109aa --- /dev/null +++ b/README.ddtp @@ -0,0 +1,74 @@ +TODO: +- URL-Remap for the translation files (to hack around the problem that + they are not on any ftp server yet but only on http://ddtp.debian.org/) + +Here is the original announcement of the ddtp support: + +* To: debian-devel-announce@lists.debian.org +* Subject: Translate files +* From: Michael Bramer <grisu@debian.org> +* Date: Sun, 6 Oct 2002 21:56:06 +0200 +* Mail-followup-to: debian-devel@lists.debian.org +* Message-id: <20021006195605.GA30516@home.debsupport.de> +* Old-return-path: <michael@home.debsupport.de> +* User-agent: Mutt/1.3.28i + +Hello all + +After some discussion between Anthony Towns (a ftpmaster), Jason +Gunthorpe (APT Developer) and some DDTP Coordinators we find a way to +transfer the translated package descriptions from the archive to the +user. + +The translated descriptions need to be downloadable befor any +installation process, like the other package meta information. We +choose a new file per languages with all translated package +descriptions. The package system can download one or more of this +files at 'apt-get update' time and know the translations. + +The new files are names 'Translate-$lang' and the file have this +rfc822-format: + Package: <package-name> + Description-md5: <the md5 checksum of the english description> + Description-$lang.$encoding: <translated headline> + <translated section> + +The encoding of the Description is 'UTF-8' in all languages normal. +The files will be located at 'debian/dists/sid/main/i18n/' on the ftp +server (for all architecture). In addition of the plain +'Translate-$lang' file, there will be a 'gz' and a 'bz2' version and +in future also the new incremental format version. + +The <the md5 checksum of the english description> is the md5 checksum +of the full english description, without the 'Description: '-tag and +with all spaces and newlines. Look at this example: + Description: XXX + YYY + . + ZZZ +is md5("XXX\n YYY\n .\n ZZZ\n") (perl-syntax). + + +A future APT version will download one or some 'Translate-$lang' +file(s) at 'update'-time. After this download it show a translated +description instead of the english form, if it found a translated +description of the package with the right md5 chechsum. The enviroment +of the user will controlled this process (LANG, LANGUAGE, LC_MESSAGES, +etc). With this the package system will never show a outdated +translation. + +The translations come all from the DDTP. A daily process on +ddtp.debian.org make new 'Translated-$lang' files and a script on +ftp-master request this files and move this to the debian archive. +Now the first files are accessable at + <a href="http://ddtp.debian.org/pdesc/translatefiles/">http://ddtp.debian.org/pdesc/translatefiles/</a> + +If you found wrong translations, please read the guides on +ddtp.debian.org, make a better translation and send this per mail to +the DDTP server. Don't bug the package maintainer! + +Thanks +Grisu +-- +Michael Bramer - a Debian Linux Developer <a href="http://www.debsupport.de">http://www.debsupport.de</a> +PGP: finger grisu@db.debian.org -- Linux Sysadmin -- Use Debian Linux diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 0c1aad485..1b9120586 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -21,6 +21,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> @@ -28,6 +30,7 @@ #include <unistd.h> #include <errno.h> #include <string> +#include <sstream> #include <stdio.h> /*}}}*/ @@ -97,7 +100,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())); @@ -128,14 +132,432 @@ 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); + } + } + } + + // we have something, queue the next diff + if(found) + { + // queue the diffs + int last_space = Description.rfind(" "); + if(last_space != string::npos) + Description.erase(last_space, Description.size()-last_space); + new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, + ExpectedMD5, available_patches); + Complete = false; + Status = StatDone; + Dequeue(); + return true; + } + } + + // Nothing found, report and return false + // Failing here is ok, if we return false later, the full + // IndexFile is queued + if(Debug) + std::clog << "Can't find a patch in the index file" << std::endl; + 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); + + 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 = 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); + chmod(FinalFile.c_str(),0644); + + // 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; @@ -191,9 +613,15 @@ void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) Complete = false; Dequeue(); return; + } + + // on decompression failure, remove bad versions in partial/ + if(Decompression && Erase) { + string s = _config->FindDir("Dir::State::lists") + "partial/"; + s += URItoFileName(RealURI); + unlink(s.c_str()); } - Item::Failed(Message,Cnf); } @@ -305,6 +733,35 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5, Mode = decompProg; } +// AcqIndexTrans::pkgAcqIndexTrans - Constructor /*{{{*/ +// --------------------------------------------------------------------- +/* The Translation file is added to the queue */ +pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner, + string URI,string URIDesc,string ShortDesc) : + pkgAcqIndex(Owner, URI, URIDesc, ShortDesc, "", "") +{ +} + + /*}}}*/ +// AcqIndexTrans::Failed - Silence failure messages for missing files /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void pkgAcqIndexTrans::Failed(string Message,pkgAcquire::MethodConfig *Cnf) +{ + if (Cnf->LocalOnly == true || + StringToBool(LookupTag(Message,"Transient-Failure"),false) == false) + { + // Ignore this + Status = StatDone; + Complete = false; + Dequeue(); + return; + } + + Item::Failed(Message,Cnf); +} + /*}}}*/ + pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, string URI,string URIDesc,string ShortDesc, string MetaIndexURI, string MetaIndexURIDesc, @@ -318,8 +775,9 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, DestFile = _config->FindDir("Dir::State::lists") + "partial/"; DestFile += URItoFileName(URI); - // remove any partial downloaded sig-file. it may confuse proxies - // and is too small to warrant a partial download anyway + // remove any partial downloaded sig-file in partial/. + // it may confuse proxies and is too small to warrant a + // partial download anyway unlink(DestFile.c_str()); // Create the item @@ -386,17 +844,22 @@ void pkgAcqMetaSig::Done(string Message,unsigned long Size,string MD5, /*}}}*/ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) { + string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); // if we get a network error we fail gracefully - if(LookupTag(Message,"FailReason") == "Timeout" || - LookupTag(Message,"FailReason") == "TmpResolveFailure" || - LookupTag(Message,"FailReason") == "ConnectionRefused") { + if(Status == StatTransientNetworkError) + { Item::Failed(Message,Cnf); + // move the sigfile back on transient network failures + if(FileExists(DestFile)) + Rename(DestFile,Final); + + // set the status back to , Item::Failed likes to reset it + Status = pkgAcquire::Item::StatTransientNetworkError; 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 @@ -529,6 +992,7 @@ void pkgAcqMetaIndex::RetrievalDone(string Message) // Move it into position Rename(DestFile,FinalFile); } + chmod(FinalFile.c_str(),0644); DestFile = FinalFile; } @@ -598,9 +1062,14 @@ 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); } } @@ -634,7 +1103,7 @@ bool pkgAcqMetaIndex::VerifyVendor(string Message) // 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 " + string msg = _("There is no public key available for the " "following key IDs:\n"); pos = Message.find("NO_PUBKEY "); if (pos != std::string::npos) diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index b47e198d8..f5272ed86 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -9,8 +9,8 @@ the Owner Acquire class. Derived classes will then call QueueURI to register all the URI's they wish to fetch at the initial moment. - Two item classes are provided to provide functionality for downloading - of Index files and downloading of Packages. + Three item classes are provided to provide functionality for + downloading of Index, Translation and Packages files. A Archive class is provided for downloading .deb files. It does Md5 checking and source location as well as a retry algorithm. @@ -28,67 +28,491 @@ #include <apt-pkg/indexrecords.h> -// 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, + + /** \brief The item was could not be downloaded because of + * a transient network error (e.g. network down) + */ + StatTransientNetworkError + } 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: @@ -100,26 +524,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=""); +}; + +/** \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 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: @@ -131,29 +649,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; + /** \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: @@ -165,6 +744,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, @@ -172,28 +752,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); @@ -201,18 +811,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: @@ -224,13 +865,40 @@ class pkgAcqFile : public pkgAcquire::Item virtual string MD5Sum() {return Md5Hash;}; virtual string DescURI() {return Desc.URI;}; - // 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. + /** \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 1c0b9f67c..0fd846f54 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 @@ -83,4 +90,6 @@ class pkgAcqMethod virtual ~pkgAcqMethod() {}; }; +/** @} */ + #endif diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 063aa5ed7..25d40ef54 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -304,6 +304,13 @@ bool pkgAcquire::Worker::RunMessages() pkgAcquire::Item *Owner = Itm->Owner; pkgAcquire::ItemDesc Desc = *Itm; OwnerQ->ItemDone(Itm); + + // set some status + if(LookupTag(Message,"FailReason") == "Timeout" || + LookupTag(Message,"FailReason") == "TmpResolveFailure" || + LookupTag(Message,"FailReason") == "ConnectionRefused") + Owner->Status = pkgAcquire::Item::StatTransientNetworkError; + Owner->Failed(Message,Config); ItemDone(); diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h index d5f8c63d2..2942df69f 100644 --- a/apt-pkg/acquire-worker.h +++ b/apt-pkg/acquire-worker.h @@ -9,13 +9,38 @@ ##################################################################### */ /*}}}*/ + +/** \addtogroup acquire + * @{ + * + * \file acquire-worker.h + */ + #ifndef PKGLIB_ACQUIRE_WORKER_H #define PKGLIB_ACQUIRE_WORKER_H #include <apt-pkg/acquire.h> -// 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; @@ -23,64 +48,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 ed78ec971..cbd67055d 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -190,9 +190,9 @@ void pkgAcquire::Enqueue(ItemDesc &Item) Item.Owner->Status = Item::StatIdle; // Queue it into the named queue - I->Enqueue(Item); - ToFetch++; - + if(I->Enqueue(Item)) + ToFetch++; + // Some trace stuff if (Debug == true) { @@ -546,11 +546,17 @@ pkgAcquire::Queue::~Queue() // Queue::Enqueue - Queue an item to the queue /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgAcquire::Queue::Enqueue(ItemDesc &Item) +bool pkgAcquire::Queue::Enqueue(ItemDesc &Item) { QItem **I = &Items; - for (; *I != 0; I = &(*I)->Next); - + // move to the end of the queue and check for duplicates here + for (; *I != 0; I = &(*I)->Next) + if (Item.URI == (*I)->URI) + { + Item.Owner->Status = Item::StatDone; + return false; + } + // Create a new item QItem *Itm = new QItem; *Itm = Item; @@ -560,6 +566,7 @@ void pkgAcquire::Queue::Enqueue(ItemDesc &Item) Item.Owner->QueueCounter++; if (Items->Next == 0) Cycle(); + return true; } /*}}}*/ // Queue::Dequeue - Remove an item from the queue /*{{{*/ diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index 6e836ac49..1de6f5e44 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 @@ -43,6 +77,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: @@ -57,97 +100,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}; + + /** \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); - RunResult Run(int PulseIntervall=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; @@ -157,45 +402,145 @@ 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 - void Enqueue(ItemDesc &Item); + /** \brief Insert the given fetch request into this queue. + * + * \return \b true if the queuing was successful. May return + * \b false if the Item is already in the queue + */ + bool 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; @@ -206,11 +551,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) @@ -221,61 +569,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 3ac98216b..b21fcbb2f 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -17,10 +17,14 @@ #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 <cstdlib> +#include <algorithm> #include <iostream> /*}}}*/ using namespace std; @@ -97,6 +101,7 @@ bool pkgSimulate::Install(PkgIterator iPkg,string /*File*/) DepIterator End; D.GlobOr(Start,End); if (Start->Type == pkgCache::Dep::Conflicts || + Start->Type == pkgCache::Dep::DpkgBreaks || Start->Type == pkgCache::Dep::Obsoletes || End->Type == pkgCache::Dep::PreDepends) { @@ -146,6 +151,8 @@ bool pkgSimulate::Configure(PkgIterator iPkg) cout << " Obsoletes:" << D.TargetPkg().Name(); else if (D->Type == pkgCache::Dep::Conflicts) cout << " Conflicts:" << D.TargetPkg().Name(); + else if (D->Type == pkgCache::Dep::DpkgBreaks) + cout << " Breaks:" << D.TargetPkg().Name(); else cout << " Depends:" << D.TargetPkg().Name(); } @@ -217,6 +224,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) @@ -227,13 +236,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()); @@ -250,12 +259,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); } @@ -281,10 +290,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 */ @@ -297,7 +308,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); @@ -314,23 +325,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); @@ -342,7 +355,7 @@ bool pkgDistUpgrade(pkgDepCache &Cache) if (I->SelectedState == pkgCache::State::Hold) { Fix.Protect(I); - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); } } } @@ -357,6 +370,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) @@ -373,7 +388,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(); @@ -386,6 +401,8 @@ bool pkgAllUpgrade(pkgDepCache &Cache) the package is restored. */ bool pkgMinimizeUpgrade(pkgDepCache &Cache) { + pkgDepCache::ActionGroup group(Cache); + if (Cache.BrokenCount() != 0) return false; @@ -402,9 +419,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.. @@ -491,8 +508,10 @@ void pkgProblemResolver::MakeScores() Score += PrioMap[Cache[I].InstVerIter(Cache)->Priority]; /* This helps to fix oddball problems with conflicting packages - on the same level. We enhance the score of installed packages */ - if (I->CurrentVer != 0) + on the same level. We enhance the score of installed packages + if those are not obsolete + */ + if (I->CurrentVer != 0 && Cache[I].CandidateVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable()) Score += 1; } @@ -562,6 +581,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) @@ -570,7 +591,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) @@ -634,6 +655,7 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg) /* We let the algorithm deal with conflicts on its next iteration, it is much smarter than us */ if (Start->Type == pkgCache::Dep::Conflicts || + Start->Type == pkgCache::Dep::DpkgBreaks || Start->Type == pkgCache::Dep::Obsoletes) break; @@ -655,7 +677,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; @@ -682,6 +704,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 @@ -697,7 +721,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; } @@ -763,14 +787,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) @@ -781,7 +805,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) continue; if (Debug == true) - cout << "Investigating " << I.Name() << endl; + clog << "Investigating " << I.Name() << endl; // Isolate the problem dependency PackageKill KillList[100]; @@ -815,7 +839,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; } } @@ -836,7 +860,12 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) OldEnd = LEnd; } else + { Start++; + // We only worry about critical deps. + if (Start.IsCritical() != true) + continue; + } // Dep is ok if ((Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall) @@ -854,6 +883,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) SPtrArray<pkgCache::Version *> VList = Start.AllTargets(); if (*VList == 0 && (Flags[I->ID] & Protected) != Protected && Start->Type != pkgCache::Dep::Conflicts && + Start->Type != pkgCache::Dep::DpkgBreaks && Start->Type != pkgCache::Dep::Obsoletes && Cache[I].NowBroken() == false) { @@ -865,7 +895,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) } Change = true; - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); break; } @@ -884,6 +914,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) if (Scores[I->ID] <= Scores[Pkg->ID] || ((Cache[Start] & pkgDepCache::DepNow) == 0 && End->Type != pkgCache::Dep::Conflicts && + End->Type != pkgCache::Dep::DpkgBreaks && End->Type != pkgCache::Dep::Obsoletes)) { // Try a little harder to fix protected packages.. @@ -902,7 +933,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 @@ -911,7 +942,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; @@ -949,7 +980,22 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) (Start->Type == pkgCache::Dep::Conflicts || Start->Type == pkgCache::Dep::Obsoletes)) continue; - + + if (Start->Type == pkgCache::Dep::DpkgBreaks) + { + /* Would it help if we upgraded? */ + if (Cache[End] & pkgDepCache::DepGCVer) { + if (Debug) + clog << " Upgrading " << Pkg.Name() << " due to Breaks field in " << I.Name() << endl; + Cache.MarkInstall(Pkg, false, 0, false); + continue; + } + if (Debug) + clog << " Will not break " << Pkg.Name() << " as stated in Breaks field in " << I.Name() <<endl; + Cache.MarkKeep(I, false, false); + continue; + } + // Skip adding to the kill list if it is protected if ((Flags[Pkg->ID] & Protected) != 0) continue; @@ -970,6 +1016,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) // Hm, nothing can possibly satisify this dep. Nuke it. if (VList[0] == 0 && Start->Type != pkgCache::Dep::Conflicts && + Start->Type != pkgCache::Dep::DpkgBreaks && Start->Type != pkgCache::Dep::Obsoletes && (Flags[I->ID] & Protected) != Protected) { @@ -983,7 +1030,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; @@ -1028,7 +1075,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) @@ -1058,6 +1105,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; } /*}}}*/ @@ -1068,6 +1129,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) @@ -1101,7 +1164,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; @@ -1149,7 +1212,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) @@ -1186,14 +1249,21 @@ 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) { if ((Flags[I->ID] & ToRemove) == ToRemove) Cache.MarkDelete(I); - else - Cache.MarkInstall(I,false); + else + { + // preserver the information if the package was auto + // or manual installed + bool autoInst = (Cache[I].Flags & pkgCache::Flag::Auto); + Cache.MarkInstall(I, false, 0, !autoInst); + } } } } @@ -1229,3 +1299,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 c412eaa97..08eafca0f 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -96,7 +96,7 @@ class pkgCache::VerIterator { Version *Ver; pkgCache *Owner; - + void _dummy(); public: @@ -125,6 +125,8 @@ class pkgCache::VerIterator inline const char *Section() const {return Ver->Section == 0?0:Owner->StrP + Ver->Section;}; inline const char *Arch() const {return Ver->Arch == 0?0:Owner->StrP + Ver->Arch;}; inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + Ver->ParentPkg);}; + inline DescIterator DescriptionList() const; + DescIterator TranslatedDescription() const; inline DepIterator DependsList() const; inline PrvIterator ProvidesList() const; inline VerFileIterator FileList() const; @@ -145,6 +147,50 @@ class pkgCache::VerIterator }; }; +// Description Iterator +class pkgCache::DescIterator +{ + Description *Desc; + pkgCache *Owner; + + void _dummy(); + + public: + + // Iteration + void operator ++(int) {if (Desc != Owner->DescP) Desc = Owner->DescP + Desc->NextDesc;}; + inline void operator ++() {operator ++(0);}; + inline bool end() const {return Desc == Owner->DescP?true:false;}; + inline void operator =(const DescIterator &B) {Desc = B.Desc; Owner = B.Owner;}; + + // Comparison + inline bool operator ==(const DescIterator &B) const {return Desc == B.Desc;}; + inline bool operator !=(const DescIterator &B) const {return Desc != B.Desc;}; + int CompareDesc(const DescIterator &B) const; + + // Accessors + inline Description *operator ->() {return Desc;}; + inline Description const *operator ->() const {return Desc;}; + inline Description &operator *() {return *Desc;}; + inline Description const &operator *() const {return *Desc;}; + inline operator Description *() {return Desc == Owner->DescP?0:Desc;}; + inline operator Description const *() const {return Desc == Owner->DescP?0:Desc;}; + inline pkgCache *Cache() {return Owner;}; + + inline const char *LanguageCode() const {return Owner->StrP + Desc->language_code;}; + inline const char *md5() const {return Owner->StrP + Desc->md5sum;}; + inline DescFileIterator FileList() const; + inline unsigned long Index() const {return Desc - Owner->DescP;}; + + inline DescIterator() : Desc(0), Owner(0) {}; + inline DescIterator(pkgCache &Owner,Description *Trg = 0) : Desc(Trg), + Owner(&Owner) + { + if (Desc == 0) + Desc = Owner.DescP; + }; +}; + // Dependency iterator class pkgCache::DepIterator { @@ -335,6 +381,38 @@ class pkgCache::VerFileIterator inline VerFileIterator(pkgCache &Owner,VerFile *Trg) : Owner(&Owner), FileP(Trg) {}; }; +// Description File +class pkgCache::DescFileIterator +{ + pkgCache *Owner; + DescFile *FileP; + + public: + + // Iteration + void operator ++(int) {if (FileP != Owner->DescFileP) FileP = Owner->DescFileP + FileP->NextFile;}; + inline void operator ++() {operator ++(0);}; + inline bool end() const {return FileP == Owner->DescFileP?true:false;}; + + // Comparison + inline bool operator ==(const DescFileIterator &B) const {return FileP == B.FileP;}; + inline bool operator !=(const DescFileIterator &B) const {return FileP != B.FileP;}; + + // Accessors + inline DescFile *operator ->() {return FileP;}; + inline DescFile const *operator ->() const {return FileP;}; + inline DescFile const &operator *() const {return *FileP;}; + inline operator DescFile *() {return FileP == Owner->DescFileP?0:FileP;}; + inline operator DescFile const *() const {return FileP == Owner->DescFileP?0:FileP;}; + inline pkgCache *Cache() {return Owner;}; + + inline PkgFileIterator File() const {return PkgFileIterator(*Owner,FileP->File + Owner->PkgFileP);}; + inline unsigned long Index() const {return FileP - Owner->DescFileP;}; + + inline DescFileIterator() : Owner(0), FileP(0) {}; + inline DescFileIterator(pkgCache &Owner,DescFile *Trg) : Owner(&Owner), FileP(Trg) {}; +}; + // Inlined Begin functions cant be in the class because of order problems inline pkgCache::VerIterator pkgCache::PkgIterator::VersionList() const {return VerIterator(*Owner,Owner->VerP + Pkg->VersionList);}; @@ -344,11 +422,15 @@ inline pkgCache::DepIterator pkgCache::PkgIterator::RevDependsList() const {return DepIterator(*Owner,Owner->DepP + Pkg->RevDepends,Pkg);}; inline pkgCache::PrvIterator pkgCache::PkgIterator::ProvidesList() const {return PrvIterator(*Owner,Owner->ProvideP + Pkg->ProvidesList,Pkg);}; +inline pkgCache::DescIterator pkgCache::VerIterator::DescriptionList() const + {return DescIterator(*Owner,Owner->DescP + Ver->DescriptionList);}; inline pkgCache::PrvIterator pkgCache::VerIterator::ProvidesList() const {return PrvIterator(*Owner,Owner->ProvideP + Ver->ProvidesList,Ver);}; inline pkgCache::DepIterator pkgCache::VerIterator::DependsList() const {return DepIterator(*Owner,Owner->DepP + Ver->DependsList,Ver);}; inline pkgCache::VerFileIterator pkgCache::VerIterator::FileList() const {return VerFileIterator(*Owner,Owner->VerFileP + Ver->FileList);}; +inline pkgCache::DescFileIterator pkgCache::DescIterator::FileList() const + {return DescFileIterator(*Owner,Owner->DescFileP + Desc->FileList);}; #endif diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 9b0568d8f..4a688a5e1 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -15,6 +15,7 @@ #include <dirent.h> #include <unistd.h> #include <stdio.h> +#include <algorithm> #include "indexcopy.h" @@ -27,12 +28,16 @@ using namespace std; search that short circuits when it his a package file in the dir. This speeds it up greatly as the majority of the size is in the binary-* sub dirs. */ -bool pkgCdrom::FindPackages(string CD,vector<string> &List, - vector<string> &SList, vector<string> &SigList, +bool pkgCdrom::FindPackages(string CD, + vector<string> &List, + vector<string> &SList, + vector<string> &SigList, + vector<string> &TransList, string &InfoDir, pkgCdromStatus *log, unsigned int Depth) { static ino_t Inodes[9]; + DIR *D; // if we have a look we "pulse" now if(log) @@ -87,8 +92,28 @@ bool pkgCdrom::FindPackages(string CD,vector<string> &List, if (_config->FindB("APT::CDROM::Thorough",false) == false) return true; } + + // see if we find translatin indexes + if (stat("i18n",&Buf) == 0) + { + D = opendir("i18n"); + for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D)) + { + if(strstr(Dir->d_name,"Translation") != NULL) + { + if (_config->FindB("Debug::aptcdrom",false) == true) + std::clog << "found translations: " << Dir->d_name << "\n"; + string file = Dir->d_name; + if(file.substr(file.size()-3,file.size()) == ".gz") + file = file.substr(0,file.size()-3); + TransList.push_back(CD+"i18n/"+ file); + } + } + closedir(D); + } + - DIR *D = opendir("."); + D = opendir("."); if (D == 0) return _error->Errno("opendir","Unable to read %s",CD.c_str()); @@ -124,7 +149,7 @@ bool pkgCdrom::FindPackages(string CD,vector<string> &List, Inodes[Depth] = Buf.st_ino; // Descend - if (FindPackages(CD + Dir->d_name,List,SList,SigList,InfoDir,log,Depth+1) == false) + if (FindPackages(CD + Dir->d_name,List,SList,SigList,TransList,InfoDir,log,Depth+1) == false) break; if (chdir(CD.c_str()) != 0) @@ -609,9 +634,10 @@ bool pkgCdrom::Add(pkgCdromStatus *log) vector<string> List; vector<string> SourceList; vector<string> SigList; + vector<string> TransList; string StartDir = SafeGetCWD(); string InfoDir; - if (FindPackages(CDROM,List,SourceList, SigList,InfoDir,log) == false) + if (FindPackages(CDROM,List,SourceList, SigList,TransList,InfoDir,log) == false) { log->Update("\n"); return false; @@ -639,17 +665,20 @@ bool pkgCdrom::Add(pkgCdromStatus *log) DropRepeats(List,"Packages"); DropRepeats(SourceList,"Sources"); DropRepeats(SigList,"Release.gpg"); + DropRepeats(TransList,""); if(log) { msg.str(""); - ioprintf(msg, _("Found %i package indexes, %i source indexes and " - "%i signatures\n"), - List.size(), SourceList.size(), SigList.size()); + ioprintf(msg, _("Found %i package indexes, %i source indexes, " + "%i translation indexes and %i signatures\n"), + List.size(), SourceList.size(), TransList.size(), + SigList.size()); log->Update(msg.str(), STEP_SCAN); } if (List.size() == 0 && SourceList.size() == 0) { - UnmountCdrom(CDROM); + if (_config->FindB("APT::CDROM::NoMount",false) == false) + UnmountCdrom(CDROM); return _error->Error("Unable to locate any package files, perhaps this is not a Debian Disc"); } @@ -676,7 +705,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) if(log) { msg.str(""); - ioprintf(msg, "Found label '%s'\n", Name.c_str()); + ioprintf(msg, _("Found label '%s'\n"), Name.c_str()); log->Update(msg.str()); } Database.Set("CD::" + ID + "::Label",Name); @@ -688,7 +717,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log) { if(!log) { - UnmountCdrom(CDROM); + if (_config->FindB("APT::CDROM::NoMount",false) == false) + UnmountCdrom(CDROM); return _error->Error("No disc name found and no way to ask for it"); } @@ -733,8 +763,10 @@ bool pkgCdrom::Add(pkgCdromStatus *log) // Copy the package files to the state directory PackageCopy Copy; SourceCopy SrcCopy; + TranslationsCopy TransCopy; if (Copy.CopyPackages(CDROM,Name,List, log) == false || - SrcCopy.CopyPackages(CDROM,Name,SourceList, log) == false) + SrcCopy.CopyPackages(CDROM,Name,SourceList, log) == false || + TransCopy.CopyTranslations(CDROM,Name,TransList, log) == false) return false; // reduce the List so that it takes less space in sources.list @@ -764,7 +796,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log) string::size_type Space = (*I).find(' '); if (Space == string::npos) { - UnmountCdrom(CDROM); + if (_config->FindB("APT::CDROM::NoMount",false) == false) + UnmountCdrom(CDROM); return _error->Error("Internal error"); } @@ -781,7 +814,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log) string::size_type Space = (*I).find(' '); if (Space == string::npos) { - UnmountCdrom(CDROM); + if (_config->FindB("APT::CDROM::NoMount",false) == false) + UnmountCdrom(CDROM); return _error->Error("Internal error"); } @@ -797,7 +831,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) // Unmount and finish if (_config->FindB("APT::CDROM::NoMount",false) == false) { - log->Update(_("Unmounting CD-ROM..."), STEP_LAST); + log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST); UnmountCdrom(CDROM); } diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index b8b208c30..68d61c098 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -47,8 +47,11 @@ class pkgCdrom }; - bool FindPackages(string CD,vector<string> &List, - vector<string> &SList, vector<string> &SigList, + bool FindPackages(string CD, + vector<string> &List, + vector<string> &SList, + vector<string> &SigList, + vector<string> &TransList, string &InfoDir, pkgCdromStatus *log, unsigned int Depth = 0); bool DropBinaryArch(vector<string> &List); diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h index 1264982a8..f24bb8c70 100644 --- a/apt-pkg/contrib/cdromutl.h +++ b/apt-pkg/contrib/cdromutl.h @@ -8,7 +8,7 @@ ##################################################################### */ /*}}}*/ #ifndef PKGLIB_CDROMUTL_H -#define PKGLIB_ACQUIRE_METHOD_H +#define PKGLIB_CDROMUTL_H #include <string> @@ -17,5 +17,6 @@ using std::string; bool MountCdrom(string Path); bool UnmountCdrom(string Path); bool IdentCdrom(string CD,string &Res,unsigned int Version = 2); +bool IsMounted(string &Path); #endif diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 70ac52e30..d19a92e62 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -21,6 +21,7 @@ #include <apti18n.h> +#include <cstdlib> #include <iostream> #include <unistd.h> #include <fcntl.h> diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc index ffd1191e5..6ce6e950a 100644 --- a/apt-pkg/contrib/progress.cc +++ b/apt-pkg/contrib/progress.cc @@ -112,6 +112,8 @@ bool OpProgress::CheckChange(float Interval) if ((int)LastPercent == (int)Percent) return false; + + LastPercent = Percent; if (Interval == 0) return false; @@ -123,7 +125,6 @@ bool OpProgress::CheckChange(float Interval) if (Diff < Interval) return false; LastTime = Now; - LastPercent = Percent; return true; } /*}}}*/ diff --git a/apt-pkg/contrib/sha256.cc b/apt-pkg/contrib/sha256.cc index b75ce8a84..ecda3d8e8 100644 --- a/apt-pkg/contrib/sha256.cc +++ b/apt-pkg/contrib/sha256.cc @@ -18,6 +18,12 @@ * any later version. * */ + +#ifdef __GNUG__ +#pragma implementation "apt-pkg/sha256.h" +#endif + + #define SHA256_DIGEST_SIZE 32 #define SHA256_HMAC_BLOCK_SIZE 64 diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h index 01b638d56..c490bfa4d 100644 --- a/apt-pkg/contrib/sha256.h +++ b/apt-pkg/contrib/sha256.h @@ -16,7 +16,6 @@ #include <string> #include <algorithm> -#include <stdint.h> using std::string; using std::min; diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index aa37a099a..006452af4 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -24,16 +24,60 @@ #include <ctype.h> #include <string.h> #include <stdio.h> +#include <algorithm> #include <unistd.h> #include <regex.h> #include <errno.h> #include <stdarg.h> +#include <iconv.h> #include "config.h" using namespace std; /*}}}*/ +// UTF8ToCodeset - Convert some UTF-8 string for some codeset /*{{{*/ +// --------------------------------------------------------------------- +/* This is handy to use before display some information for enduser */ +bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest) +{ + iconv_t cd; + const char *inbuf; + char *inptr, *outbuf, *outptr; + size_t insize, outsize; + + cd = iconv_open(codeset, "UTF-8"); + if (cd == (iconv_t)(-1)) { + // Something went wrong + if (errno == EINVAL) + _error->Error("conversion from 'UTF-8' to '%s' not available", + codeset); + else + perror("iconv_open"); + + // Clean the destination string + *dest = ""; + + return false; + } + + insize = outsize = orig.size(); + inbuf = orig.data(); + inptr = (char *)inbuf; + outbuf = new char[insize+1]; + outptr = outbuf; + + iconv(cd, &inptr, &insize, &outptr, &outsize); + *outptr = '\0'; + + *dest = outbuf; + delete[] outbuf; + + iconv_close(cd); + + return true; +} + /*}}}*/ // strstrip - Remove white space from the front and back of a string /*{{{*/ // --------------------------------------------------------------------- /* This is handy to use when parsing a file. It also removes \n's left diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index b8553ab58..ae1244ecd 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -36,7 +36,8 @@ using std::ostream; #define APT_FORMAT2 #define APT_FORMAT3 #endif - + +bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest); char *_strstrip(char *String); char *_strtabexpand(char *String,size_t Len); bool ParseQuoteWord(const char *&String,string &Res); diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 2d52f7c45..ed7633803 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -301,7 +301,7 @@ pkgCache::PkgFileIterator debPackagesIndex::FindInCache(pkgCache &Cache) const pkgCache::PkgFileIterator File = Cache.FileBegin(); for (; File.end() == false; File++) { - if (FileName != File.FileName()) + if (File.FileName() == NULL || FileName != File.FileName()) continue; struct stat St; @@ -316,6 +316,170 @@ pkgCache::PkgFileIterator debPackagesIndex::FindInCache(pkgCache &Cache) const } /*}}}*/ +// TranslationsIndex::debTranslationsIndex - Contructor /*{{{*/ +// --------------------------------------------------------------------- +/* */ +debTranslationsIndex::debTranslationsIndex(string URI,string Dist,string Section) : + pkgIndexFile(true), URI(URI), Dist(Dist), Section(Section) +{ +} + /*}}}*/ +// TranslationIndex::Trans* - Return the URI to the translation files /*{{{*/ +// --------------------------------------------------------------------- +/* */ +inline string debTranslationsIndex::IndexFile(const char *Type) const +{ + return _config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type)); +} +string debTranslationsIndex::IndexURI(const char *Type) const +{ + string Res; + if (Dist[Dist.size() - 1] == '/') + { + if (Dist != "/") + Res = URI + Dist; + else + Res = URI; + } + else + Res = URI + "dists/" + Dist + '/' + Section + + "/i18n/Translation-"; + + Res += Type; + return Res; +} + /*}}}*/ +// TranslationsIndex::GetIndexes - Fetch the index files /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool debTranslationsIndex::GetIndexes(pkgAcquire *Owner) const +{ + if (TranslationsAvailable()) { + string TranslationFile = "Translation-" + LanguageCode(); + new pkgAcqIndexTrans(Owner, IndexURI(LanguageCode().c_str()), + Info(TranslationFile.c_str()), + TranslationFile); + } + + return true; +} + /*}}}*/ +// TranslationsIndex::Describe - Give a descriptive path to the index /*{{{*/ +// --------------------------------------------------------------------- +/* This should help the user find the index in the sources.list and + in the filesystem for problem solving */ +string debTranslationsIndex::Describe(bool Short) const +{ + char S[300]; + if (Short == true) + snprintf(S,sizeof(S),"%s",Info(TranslationFile().c_str()).c_str()); + else + snprintf(S,sizeof(S),"%s (%s)",Info(TranslationFile().c_str()).c_str(), + IndexFile(LanguageCode().c_str()).c_str()); + return S; +} + /*}}}*/ +// TranslationsIndex::Info - One liner describing the index URI /*{{{*/ +// --------------------------------------------------------------------- +/* */ +string debTranslationsIndex::Info(const char *Type) const +{ + string Info = ::URI::SiteOnly(URI) + ' '; + if (Dist[Dist.size() - 1] == '/') + { + if (Dist != "/") + Info += Dist; + } + else + Info += Dist + '/' + Section; + Info += " "; + Info += Type; + return Info; +} + /*}}}*/ +bool debTranslationsIndex::HasPackages() const +{ + if(!TranslationsAvailable()) + return false; + + return FileExists(IndexFile(LanguageCode().c_str())); +} + +// TranslationsIndex::Exists - Check if the index is available /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool debTranslationsIndex::Exists() const +{ + return FileExists(IndexFile(LanguageCode().c_str())); +} + /*}}}*/ +// TranslationsIndex::Size - Return the size of the index /*{{{*/ +// --------------------------------------------------------------------- +/* This is really only used for progress reporting. */ +unsigned long debTranslationsIndex::Size() const +{ + struct stat S; + if (stat(IndexFile(LanguageCode().c_str()).c_str(),&S) != 0) + return 0; + return S.st_size; +} + /*}}}*/ +// TranslationsIndex::Merge - Load the index file into a cache /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const +{ + // Check the translation file, if in use + string TranslationFile = IndexFile(LanguageCode().c_str()); + if (TranslationsAvailable() && FileExists(TranslationFile)) + { + FileFd Trans(TranslationFile,FileFd::ReadOnly); + debListParser TransParser(&Trans); + if (_error->PendingError() == true) + return false; + + Prog.SubProgress(0, Info(TranslationFile.c_str())); + if (Gen.SelectFile(TranslationFile,string(),*this) == false) + return _error->Error("Problem with SelectFile %s",TranslationFile.c_str()); + + // Store the IMS information + pkgCache::PkgFileIterator TransFile = Gen.GetCurFile(); + struct stat TransSt; + if (fstat(Trans.Fd(),&TransSt) != 0) + return _error->Errno("fstat","Failed to stat"); + TransFile->Size = TransSt.st_size; + TransFile->mtime = TransSt.st_mtime; + + if (Gen.MergeList(TransParser) == false) + return _error->Error("Problem with MergeList %s",TranslationFile.c_str()); + } + + return true; +} + /*}}}*/ +// TranslationsIndex::FindInCache - Find this index /*{{{*/ +// --------------------------------------------------------------------- +/* */ +pkgCache::PkgFileIterator debTranslationsIndex::FindInCache(pkgCache &Cache) const +{ + string FileName = IndexFile(LanguageCode().c_str()); + + pkgCache::PkgFileIterator File = Cache.FileBegin(); + for (; File.end() == false; File++) + { + if (FileName != File.FileName()) + continue; + + struct stat St; + if (stat(File.FileName(),&St) != 0) + return pkgCache::PkgFileIterator(Cache); + if ((unsigned)St.st_size != File->Size || St.st_mtime != File->mtime) + return pkgCache::PkgFileIterator(Cache); + return File; + } + return File; +} + /*}}}*/ // StatusIndex::debStatusIndex - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -412,6 +576,11 @@ class debIFTypePkg : public pkgIndexFile::Type }; debIFTypePkg() {Label = "Debian Package Index";}; }; +class debIFTypeTrans : public debIFTypePkg +{ + public: + debIFTypeTrans() {Label = "Debian Translation Index";}; +}; class debIFTypeStatus : public pkgIndexFile::Type { public: @@ -424,6 +593,7 @@ class debIFTypeStatus : public pkgIndexFile::Type }; static debIFTypeSrc _apt_Src; static debIFTypePkg _apt_Pkg; +static debIFTypeTrans _apt_Trans; static debIFTypeStatus _apt_Status; const pkgIndexFile::Type *debSourcesIndex::GetType() const @@ -434,6 +604,10 @@ const pkgIndexFile::Type *debPackagesIndex::GetType() const { return &_apt_Pkg; } +const pkgIndexFile::Type *debTranslationsIndex::GetType() const +{ + return &_apt_Trans; +} const pkgIndexFile::Type *debStatusIndex::GetType() const { return &_apt_Status; diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h index 2bc963567..b0012c96b 100644 --- a/apt-pkg/deb/debindexfile.h +++ b/apt-pkg/deb/debindexfile.h @@ -72,6 +72,36 @@ class debPackagesIndex : public pkgIndexFile debPackagesIndex(string URI,string Dist,string Section,bool Trusted); }; +class debTranslationsIndex : public pkgIndexFile +{ + string URI; + string Dist; + string Section; + + string Info(const char *Type) const; + string IndexFile(const char *Type) const; + string IndexURI(const char *Type) const; + + inline string TranslationFile() const {return "Translation-" + LanguageCode();}; + + public: + + virtual const Type *GetType() const; + + // Interface for acquire + virtual string Describe(bool Short) const; + virtual bool GetIndexes(pkgAcquire *Owner) const; + + // Interface for the Cache Generator + virtual bool Exists() const; + virtual bool HasPackages() const; + virtual unsigned long Size() const; + virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const; + virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; + + debTranslationsIndex(string URI,string Dist,string Section); +}; + class debSourcesIndex : public pkgIndexFile { string URI; diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index d0dc7a260..074abea6d 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -15,6 +15,7 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/strutl.h> #include <apt-pkg/crc-16.h> +#include <apt-pkg/md5.h> #include <ctype.h> @@ -104,6 +105,8 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) return false; if (ParseDepends(Ver,"Conflicts",pkgCache::Dep::Conflicts) == false) return false; + if (ParseDepends(Ver,"Breaks",pkgCache::Dep::DpkgBreaks) == false) + return false; if (ParseDepends(Ver,"Replaces",pkgCache::Dep::Replaces) == false) return false; @@ -117,6 +120,48 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) return true; } /*}}}*/ +// ListParser::Description - Return the description string /*{{{*/ +// --------------------------------------------------------------------- +/* This is to return the string describing the package in debian + form. If this returns the blank string then the entry is assumed to + only describe package properties */ +string debListParser::Description() +{ + if (DescriptionLanguage().empty()) + return Section.FindS("Description"); + else + return Section.FindS(("Description-" + pkgIndexFile::LanguageCode()).c_str()); +} + /*}}}*/ +// ListParser::DescriptionLanguage - Return the description lang string /*{{{*/ +// --------------------------------------------------------------------- +/* This is to return the string describing the language of + description. If this returns the blank string then the entry is + assumed to describe original description. */ +string debListParser::DescriptionLanguage() +{ + return Section.FindS("Description").empty() ? pkgIndexFile::LanguageCode() : ""; +} + /*}}}*/ +// ListParser::Description - Return the description_md5 MD5SumValue /*{{{*/ +// --------------------------------------------------------------------- +/* This is to return the md5 string to allow the check if it is the right + description. If no Description-md5 is found in the section it will be + calculated. + */ +MD5SumValue debListParser::Description_md5() +{ + string value = Section.FindS("Description-md5"); + + if (value.empty()) + { + MD5Summation md5; + md5.Add((Description() + "\n").c_str()); + return md5.Result(); + } else + return MD5SumValue(value); +} + /*}}}*/ // ListParser::UsePackage - Update a package structure /*{{{*/ // --------------------------------------------------------------------- /* This is called to update the package with any new information @@ -150,6 +195,7 @@ unsigned short debListParser::VersionHash() // "Suggests", // "Recommends", "Conflicts", + "Breaks", "Replaces",0}; unsigned long Result = INIT_FCS; char S[1024]; diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 3a0e0421b..34bb29c72 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -12,6 +12,7 @@ #define PKGLIB_DEBLISTPARSER_H #include <apt-pkg/pkgcachegen.h> +#include <apt-pkg/indexfile.h> #include <apt-pkg/tagfile.h> class debListParser : public pkgCacheGenerator::ListParser @@ -47,6 +48,9 @@ class debListParser : public pkgCacheGenerator::ListParser virtual string Package(); virtual string Version(); virtual bool NewVersion(pkgCache::VerIterator Ver); + virtual string Description(); + virtual string DescriptionLanguage(); + virtual MD5SumValue Description_md5(); virtual unsigned short VersionHash(); virtual bool UsePackage(pkgCache::PkgIterator Pkg, pkgCache::VerIterator Ver); diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 6830f9e83..73b2dda49 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -153,6 +153,16 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool GetAll) const ComputeIndexTargets(), new indexRecords (Dist)); + // Queue the translations + for (vector<const debSectionEntry *>::const_iterator I = SectionEntries.begin(); + I != SectionEntries.end(); I++) { + + if((*I)->IsSrc) + continue; + debTranslationsIndex i = debTranslationsIndex(URI,Dist,(*I)->Section); + i.GetIndexes(Owner); + } + return true; } @@ -177,11 +187,16 @@ vector <pkgIndexFile *> *debReleaseIndex::GetIndexFiles() Indexes = new vector <pkgIndexFile*>; for (vector<const debSectionEntry *>::const_iterator I = SectionEntries.begin(); - I != SectionEntries.end(); I++) + I != SectionEntries.end(); I++) { if ((*I)->IsSrc) Indexes->push_back(new debSourcesIndex (URI, Dist, (*I)->Section, IsTrusted())); else + { Indexes->push_back(new debPackagesIndex (URI, Dist, (*I)->Section, IsTrusted())); + Indexes->push_back(new debTranslationsIndex(URI, Dist, (*I)->Section)); + } + } + return Indexes; } diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc index 6ecbd15d6..8a5b6e215 100644 --- a/apt-pkg/deb/debrecords.cc +++ b/apt-pkg/deb/debrecords.cc @@ -9,7 +9,9 @@ /*}}}*/ // Include Files /*{{{*/ #include <apt-pkg/debrecords.h> +#include <apt-pkg/strutl.h> #include <apt-pkg/error.h> +#include <langinfo.h> /*}}}*/ // RecordParser::debRecordParser - Constructor /*{{{*/ @@ -28,6 +30,10 @@ bool debRecordParser::Jump(pkgCache::VerFileIterator const &Ver) { return Tags.Jump(Section,Ver->Offset); } +bool debRecordParser::Jump(pkgCache::DescFileIterator const &Desc) +{ + return Tags.Jump(Section,Desc->Offset); +} /*}}}*/ // RecordParser::FileName - Return the archive filename on the site /*{{{*/ // --------------------------------------------------------------------- @@ -58,7 +64,7 @@ string debRecordParser::MD5Hash() /* */ string debRecordParser::SHA1Hash() { - return Section.FindS("SHA1Sum"); + return Section.FindS("SHA1"); } /*}}}*/ // RecordParser::Maintainer - Return the maintainer email /*{{{*/ @@ -74,7 +80,7 @@ string debRecordParser::Maintainer() /* */ string debRecordParser::ShortDesc() { - string Res = Section.FindS("Description"); + string Res = LongDesc(); string::size_type Pos = Res.find('\n'); if (Pos == string::npos) return Res; @@ -86,21 +92,60 @@ string debRecordParser::ShortDesc() /* */ string debRecordParser::LongDesc() { - return Section.FindS("Description"); + string orig, dest; + char *codeset = nl_langinfo(CODESET); + + if (!Section.FindS("Description").empty()) + orig = Section.FindS("Description").c_str(); + else + orig = Section.FindS(("Description-" + pkgIndexFile::LanguageCode()).c_str()).c_str(); + + if (strcmp(codeset,"UTF-8") != 0) { + UTF8ToCodeset(codeset, orig, &dest); + orig = dest; + } + + return orig; } /*}}}*/ + +static const char *SourceVerSeparators = " ()"; + // RecordParser::SourcePkg - Return the source package name if any /*{{{*/ // --------------------------------------------------------------------- /* */ string debRecordParser::SourcePkg() { string Res = Section.FindS("Source"); - string::size_type Pos = Res.find(' '); + string::size_type Pos = Res.find_first_of(SourceVerSeparators); if (Pos == string::npos) return Res; return string(Res,0,Pos); } /*}}}*/ +// RecordParser::SourceVer - Return the source version number if present /*{{{*/ +// --------------------------------------------------------------------- +/* */ +string debRecordParser::SourceVer() +{ + string Pkg = Section.FindS("Source"); + string::size_type Pos = Pkg.find_first_of(SourceVerSeparators); + if (Pos == string::npos) + return ""; + + string::size_type VerStart = Pkg.find_first_not_of(SourceVerSeparators, Pos); + if(VerStart == string::npos) + return ""; + + string::size_type VerEnd = Pkg.find_first_of(SourceVerSeparators, VerStart); + if(VerEnd == string::npos) + // Corresponds to the case of, e.g., "foo (1.2" without a closing + // paren. Be liberal and guess what it means. + return string(Pkg, VerStart); + else + return string(Pkg, VerStart, VerEnd - VerStart); +} + /*}}}*/ // RecordParser::GetRec - Return the whole record /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h index 3f1956164..df21931a8 100644 --- a/apt-pkg/deb/debrecords.h +++ b/apt-pkg/deb/debrecords.h @@ -15,6 +15,7 @@ #define PKGLIB_DEBRECORDS_H #include <apt-pkg/pkgrecords.h> +#include <apt-pkg/indexfile.h> #include <apt-pkg/tagfile.h> class debRecordParser : public pkgRecords::Parser @@ -26,6 +27,7 @@ class debRecordParser : public pkgRecords::Parser protected: virtual bool Jump(pkgCache::VerFileIterator const &Ver); + virtual bool Jump(pkgCache::DescFileIterator const &Desc); public: @@ -34,6 +36,7 @@ class debRecordParser : public pkgRecords::Parser virtual string MD5Hash(); virtual string SHA1Hash(); virtual string SourcePkg(); + virtual string SourceVer(); // These are some general stats about the package virtual string Maintainer(); diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index 21d7392a0..fcd9bb901 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -14,6 +14,8 @@ #include <apt-pkg/error.h> #include <apt-pkg/strutl.h> #include <apt-pkg/configuration.h> + +using std::max; /*}}}*/ // SrcRecordParser::Binaries - Return the binaries field /*{{{*/ @@ -30,31 +32,19 @@ const char **debSrcRecordParser::Binaries() if (Bins.empty() == true || Bins.length() >= 102400) return 0; - // Workaround for #236688. Only allocate a new buffer if the field - // is large, to avoid a performance penalty - char *BigBuf = NULL; - char *Buf; - if (Bins.length() > sizeof(Buffer)) - { - BigBuf = new char[Bins.length()]; - Buf = BigBuf; - } - else + if (Bins.length() >= BufSize) { - Buf = Buffer; + delete [] Buffer; + // allocate new size based on buffer (but never smaller than 4000) + BufSize = max((unsigned int)4000, max((unsigned int)Bins.length()+1,2*BufSize)); + Buffer = new char[BufSize]; } - strcpy(Buf,Bins.c_str()); - if (TokSplitString(',',Buf,StaticBinList, + strcpy(Buffer,Bins.c_str()); + if (TokSplitString(',',Buffer,StaticBinList, sizeof(StaticBinList)/sizeof(StaticBinList[0])) == false) - { - if (BigBuf != NULL) - delete BigBuf; return 0; - } - if (BigBuf != NULL) - delete BigBuf; return (const char **)StaticBinList; } /*}}}*/ diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index 51e063812..8b1237ccd 100644 --- a/apt-pkg/deb/debsrcrecords.h +++ b/apt-pkg/deb/debsrcrecords.h @@ -21,9 +21,10 @@ class debSrcRecordParser : public pkgSrcRecords::Parser FileFd Fd; pkgTagFile Tags; pkgTagSection Sect; - char Buffer[10000]; char *StaticBinList[400]; unsigned long iOffset; + char *Buffer; + unsigned int BufSize; public: @@ -46,10 +47,9 @@ class debSrcRecordParser : public pkgSrcRecords::Parser }; virtual bool Files(vector<pkgSrcRecords::File> &F); - debSrcRecordParser(string File,pkgIndexFile const *Index) : - Parser(Index), - Fd(File,FileFd::ReadOnly), - Tags(&Fd,102400) {}; + debSrcRecordParser(string File,pkgIndexFile const *Index) + : Parser(Index), Fd(File,FileFd::ReadOnly), Tags(&Fd,102400), + Buffer(0), BufSize(0) {} }; #endif diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 905ac93c4..e5506d3bf 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -471,6 +471,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) case Item::Install: Args[n++] = "--unpack"; Size += strlen(Args[n-1]); + Args[n++] = "--auto-deconfigure"; + Size += strlen(Args[n-1]); break; } @@ -621,15 +623,22 @@ bool pkgDPkgPM::Go(int OutStatusFd) */ char* list[5]; - if(!TokSplitString(':', line, list, sizeof(list)/sizeof(list[0]))) - // FIXME: dpkg sends multiline error messages sometimes (see - // #374195 for a example. we should support this by - // either patching dpkg to not send multiline over the - // statusfd or by rewriting the code here to deal with - // it. for now we just ignore it and not crash - continue; + // dpkg sends multiline error messages sometimes (see + // #374195 for a example. we should support this by + // either patching dpkg to not send multiline over the + // statusfd or by rewriting the code here to deal with + // it. for now we just ignore it and not crash + TokSplitString(':', line, list, sizeof(list)/sizeof(list[0])); char *pkg = list[1]; char *action = _strstrip(list[2]); + if( pkg == NULL || action == NULL) + { + if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) + std::clog << "ignoring line: not enough ':'" << std::endl; + // reset the line buffer + line[0]=0; + continue; + } if(strncmp(action,"error",strlen("error")) == 0) { @@ -701,14 +710,23 @@ bool pkgDPkgPM::Go(int OutStatusFd) // Check for an error code. if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0) { - RunScripts("DPkg::Post-Invoke"); - if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) - return _error->Error("Sub-process %s received a segmentation fault.",Args[0]); - - if (WIFEXITED(Status) != 0) - return _error->Error("Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status)); + // if it was set to "keep-dpkg-runing" then we won't return + // here but keep the loop going and just report it as a error + // for later + bool stopOnError = _config->FindB("Dpkg::StopOnError",true); - return _error->Error("Sub-process %s exited unexpectedly",Args[0]); + if(stopOnError) + RunScripts("DPkg::Post-Invoke"); + + if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) + _error->Error("Sub-process %s received a segmentation fault.",Args[0]); + else if (WIFEXITED(Status) != 0) + _error->Error("Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status)); + else + _error->Error("Sub-process %s exited unexpectedly",Args[0]); + + if(stopOnError) + return false; } } diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 45eb6b15b..7da729904 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -43,7 +43,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 70bc9f086..ac667d51d 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -13,16 +13,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; @@ -45,6 +81,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]; @@ -70,7 +110,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(); @@ -92,11 +132,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 @@ -111,7 +270,7 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res) we allow it anyhow because dpkg does. Technically it is a packaging bug. Conflicts may never self match */ if (Dep.TargetPkg() != Dep.ParentPkg() || - (Dep->Type != Dep::Conflicts && Dep->Type != Dep::Obsoletes)) + (Dep->Type != Dep::Conflicts && Dep->Type != Dep::DpkgBreaks && Dep->Type != Dep::Obsoletes)) { PkgIterator Pkg = Dep.TargetPkg(); // Check the base package @@ -141,7 +300,8 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res) { /* Provides may never be applied against the same package if it is a conflicts. See the comment above. */ - if (P.OwnerPkg() == Pkg && Dep->Type == Dep::Conflicts) + if (P.OwnerPkg() == Pkg && + (Dep->Type == Dep::Conflicts || Dep->Type == Dep::DpkgBreaks)) continue; // Check if the provides is a hit @@ -237,9 +397,11 @@ void pkgDepCache::AddStates(const PkgIterator &Pkg,int Add) { StateCache &State = PkgState[Pkg->ID]; - // The Package is broken + // The Package is broken (either minimal dep or policy dep) if ((State.DepState & DepInstMin) != DepInstMin) iBrokenCount += Add; + if ((State.DepState & DepInstPolicy) != DepInstPolicy) + iPolicyBrokenCount += Add; // Bad state if (Pkg.State() != PkgIterator::NeedsNothing) @@ -293,7 +455,9 @@ void pkgDepCache::BuildGroupOrs(VerIterator const &V) /* Invert for Conflicts. We have to do this twice to get the right sense for a conflicts group */ - if (D->Type == Dep::Conflicts || D->Type == Dep::Obsoletes) + if (D->Type == Dep::Conflicts || + D->Type == Dep::DpkgBreaks || + D->Type == Dep::Obsoletes) State = ~State; // Add to the group if we are within an or.. @@ -304,7 +468,9 @@ void pkgDepCache::BuildGroupOrs(VerIterator const &V) Group = 0; // Invert for Conflicts - if (D->Type == Dep::Conflicts || D->Type == Dep::Obsoletes) + if (D->Type == Dep::Conflicts || + D->Type == Dep::DpkgBreaks || + D->Type == Dep::Obsoletes) State = ~State; } } @@ -437,7 +603,9 @@ void pkgDepCache::Update(OpProgress *Prog) Group = 0; // Invert for Conflicts - if (D->Type == Dep::Conflicts || D->Type == Dep::Obsoletes) + if (D->Type == Dep::Conflicts || + D->Type == Dep::DpkgBreaks || + D->Type == Dep::Obsoletes) State = ~State; } } @@ -450,12 +618,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 @@ -465,7 +635,9 @@ void pkgDepCache::Update(DepIterator D) State = DependencyState(D); // Invert for Conflicts - if (D->Type == Dep::Conflicts || D->Type == Dep::Obsoletes) + if (D->Type == Dep::Conflicts || + D->Type == Dep::DpkgBreaks || + D->Type == Dep::Obsoletes) State = ~State; RemoveStates(D.ParentPkg()); @@ -507,7 +679,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) @@ -519,6 +691,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]; @@ -534,8 +709,17 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg,bool Soft) // We dont even try to keep virtual packages.. if (Pkg->VersionList == 0) return; - - P.Flags &= ~Flag::Auto; +#if 0 // reseting the autoflag here means we lose the + // auto-mark information if a user selects a package for removal + // but changes his mind then and sets it for keep again + // - this makes sense as default when all Garbage dependencies + // are automatically marked for removal (as aptitude does). + // setting a package for keep then makes it no longer autoinstalled + // for all other use-case this action is rather suprising + if(FromUser && !P.Marked) + P.Flags &= ~Flag::Auto; +#endif + RemoveSizes(Pkg); RemoveStates(Pkg); @@ -561,6 +745,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); @@ -583,7 +769,6 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge) else P.Mode = ModeDelete; P.InstallVer = 0; - P.Flags &= Flag::Auto; AddStates(Pkg); Update(Pkg); @@ -594,7 +779,8 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge) // --------------------------------------------------------------------- /* */ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, - unsigned long Depth) + unsigned long Depth, bool FromUser, + bool ForceImportantDeps) { if (Depth > 100) return; @@ -603,26 +789,27 @@ 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]; P.iFlags &= ~AutoKept; - if (P.InstBroken() == false && (P.Mode == ModeInstall || + if ((P.InstPolicyBroken() == false && P.InstBroken() == false) && + (P.Mode == ModeInstall || P.CandidateVer == (Version *)Pkg.CurrentVer())) { if (P.CandidateVer == (Version *)Pkg.CurrentVer() && P.InstallVer == 0) - MarkKeep(Pkg); + MarkKeep(Pkg, false, FromUser); return; } // See if there is even any possible instalation candidate if (P.CandidateVer == 0) return; - // We dont even try to install virtual packages.. if (Pkg->VersionList == 0) return; - /* Target the candidate version and remove the autoflag. We reset the autoflag below if this was called recursively. Otherwise the user should have the ability to de-auto a package by changing its state */ @@ -631,7 +818,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; @@ -663,10 +863,43 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, /* Check if this dep should be consider for install. If it is a user defined important dep and we are installed a new package then - it will be installed. Otherwise we only worry about critical deps */ + it will be installed. Otherwise we only check for important + deps that have changed from the installed version + */ if (IsImportantDep(Start) == false) continue; - if (Pkg->CurrentVer != 0 && Start.IsCritical() == false) + + /* check if any ImportantDep() (but not Critial) where added + * since we installed the package + */ + bool isNewImportantDep = false; + if(!ForceImportantDeps && !Start.IsCritical()) + { + bool found=false; + VerIterator instVer = Pkg.CurrentVer(); + if(!instVer.end()) + { + for (DepIterator D = instVer.DependsList(); D.end() != true; D++) + { + //FIXME: deal better with or-groups(?) + DepIterator LocalStart = D; + + if(IsImportantDep(D) && Start.TargetPkg() == D.TargetPkg()) + found=true; + } + // this is a new dep if it was not found to be already + // a important dep of the installed pacakge + isNewImportantDep = !found; + } + } + if(isNewImportantDep) + if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true) + std::clog << "new important dependency: " + << Start.TargetPkg().Name() << std::endl; + + // skip important deps if the package is already installed + if (Pkg->CurrentVer != 0 && Start.IsCritical() == false + && !isNewImportantDep && !ForceImportantDeps) continue; /* If we are in an or group locate the first or that can @@ -677,7 +910,8 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, /* This bit is for processing the possibilty of an install/upgrade fixing the problem */ SPtrArray<Version *> List = Start.AllTargets(); - if ((DepState[Start->ID] & DepCVer) == DepCVer) + if (Start->Type != Dep::DpkgBreaks && + (DepState[Start->ID] & DepCVer) == DepCVer) { // Right, find the best version to install.. Version **Cur = List; @@ -708,33 +942,48 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, } } - if (InstPkg.end() == false) + if (InstPkg.end() == false) { 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); - - // Set the autoflag, after MarkInstall because MarkInstall unsets it - if (P->CurrentVer == 0) - PkgState[InstPkg->ID].Flags |= Flag::Auto; + // now check if we should consider it a automatic dependency or not + string sec = _config->Find("APT::Never-MarkAuto-Section",""); + if(Pkg.Section() && (string(Pkg.Section()) == sec)) + { + if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true) + std::clog << "Setting NOT as auto-installed because its a direct dep of a package in section " << sec << std::endl; + MarkInstall(InstPkg,true,Depth + 1, true); + } + else + { + // mark automatic dependency + MarkInstall(InstPkg,true,Depth + 1, false, ForceImportantDeps); + // Set the autoflag, after MarkInstall because MarkInstall unsets it + if (P->CurrentVer == 0) + PkgState[InstPkg->ID].Flags |= Flag::Auto; + } } - continue; } - + /* For conflicts we just de-install the package and mark as auto, - Conflicts may not have or groups */ - if (Start->Type == Dep::Conflicts || Start->Type == Dep::Obsoletes) + Conflicts may not have or groups. For dpkg's Breaks we try to + upgrade the package. */ + if (Start->Type == Dep::Conflicts || Start->Type == Dep::Obsoletes || + Start->Type == Dep::DpkgBreaks) { for (Version **I = List; *I != 0; I++) { VerIterator Ver(*this,*I); PkgIterator Pkg = Ver.ParentPkg(); - - MarkDelete(Pkg); - PkgState[Pkg->ID].Flags |= Flag::Auto; + + if (Start->Type != Dep::DpkgBreaks) + MarkDelete(Pkg); + else + if (PkgState[Pkg->ID].CandidateVer != *I) + MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps); } continue; } @@ -746,6 +995,8 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, /* */ void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To) { + ActionGroup group(*this); + RemoveSizes(Pkg); RemoveStates(Pkg); @@ -764,9 +1015,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); @@ -779,6 +1032,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 /*{{{*/ // --------------------------------------------------------------------- @@ -866,6 +1131,244 @@ pkgCache::VerIterator pkgDepCache::Policy::GetCandidateVer(PkgIterator Pkg) /* */ bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep) { - return Dep.IsCritical(); + if(Dep.IsCritical()) + return true; + else if(Dep->Type == pkgCache::Dep::Recommends) + { + if ( _config->FindB("APT::Install-Recommends", false)) + return true; + // we suport a special mode to only install-recommends for certain + // sections + // FIXME: this is a meant as a temporarly solution until the + // recommends are cleaned up + string s = _config->Find("APT::Install-Recommends-Section",""); + if(s.size() > 0) + { + const char *sec = Dep.TargetPkg().Section(); + if (sec && strcmp(sec, s.c_str()) == 0) + return true; + } + } + else if(Dep->Type == pkgCache::Dep::Suggests) + return _config->FindB("APT::Install-Suggests", false); + + return false; } /*}}}*/ + +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]; + + // skip required packages + if (!p.CurrentVer().end() && + (p.CurrentVer()->Priority == pkgCache::State::Required)) + continue; + + // if it is not marked and it is installed, it's garbage + if(!state.Marked && (!p.CurrentVer().end() || state.Install())) + { + 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 929fe93c9..b2bcfb58a 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 $ /* ###################################################################### @@ -42,9 +42,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), @@ -60,6 +122,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 @@ -76,6 +216,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 @@ -94,7 +245,9 @@ class pkgDepCache : protected pkgCache::Namespace inline bool Downgrade() const {return Status < 0 && Mode == ModeInstall;}; inline bool Held() const {return Status != 0 && Keep();}; inline bool NowBroken() const {return (DepState & DepNowMin) != DepNowMin;}; + inline bool NowPolicyBroken() const {return (DepState & DepNowPolicy) != DepNowPolicy;}; inline bool InstBroken() const {return (DepState & DepInstMin) != DepInstMin;}; + inline bool InstPolicyBroken() const {return (DepState & DepInstPolicy) != DepInstPolicy;}; inline bool Install() const {return Mode == ModeInstall;}; inline VerIterator InstVerIter(pkgCache &Cache) {return VerIterator(Cache,InstallVer);}; @@ -116,6 +269,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: @@ -130,6 +291,7 @@ class pkgDepCache : protected pkgCache::Namespace unsigned long iDelCount; unsigned long iKeepCount; unsigned long iBrokenCount; + unsigned long iPolicyBrokenCount; unsigned long iBadCount; Policy *delLocalPolicy; // For memory clean up.. @@ -179,16 +341,69 @@ 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, + bool ForceImportantDeps = false); 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;}; @@ -197,6 +412,7 @@ class pkgDepCache : protected pkgCache::Namespace inline unsigned long KeepCount() {return iKeepCount;}; inline unsigned long InstCount() {return iInstCount;}; inline unsigned long BrokenCount() {return iBrokenCount;}; + inline unsigned long PolicyBrokenCount() {return iPolicyBrokenCount;}; inline unsigned long BadCount() {return iBadCount;}; bool Init(OpProgress *Prog); diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 1f65062f7..c9dded134 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -32,6 +32,8 @@ using namespace std; + + // IndexCopy::CopyPackages - Copy the package files from the CD /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -512,10 +514,10 @@ bool SourceCopy::RewriteEntry(FILE *Target,string File) fputc('\n',Target); return true; } - - /*}}}*/ - +// SigVerify::Verify - Verify a files md5sum against its metaindex /*{{{*/ +// --------------------------------------------------------------------- +/* */ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex) { const indexRecords::checkSum *Record = MetaIndex->Lookup(file); @@ -670,3 +672,178 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList, return true; } + + +bool TranslationsCopy::CopyTranslations(string CDROM,string Name,vector<string> &List, + pkgCdromStatus *log) +{ + OpProgress *Progress = NULL; + if (List.size() == 0) + return true; + + if(log) + Progress = log->GetOpProgress(); + + bool Debug = _config->FindB("Debug::aptcdrom",false); + + // Prepare the progress indicator + unsigned long TotalSize = 0; + for (vector<string>::iterator I = List.begin(); I != List.end(); I++) + { + struct stat Buf; + if (stat(string(*I).c_str(),&Buf) != 0 && + stat(string(*I + ".gz").c_str(),&Buf) != 0) + return _error->Errno("stat","Stat failed for %s", + string(*I).c_str()); + TotalSize += Buf.st_size; + } + + unsigned long CurrentSize = 0; + unsigned int NotFound = 0; + unsigned int WrongSize = 0; + unsigned int Packages = 0; + for (vector<string>::iterator I = List.begin(); I != List.end(); I++) + { + string OrigPath = string(*I,CDROM.length()); + unsigned long FileSize = 0; + + // Open the package file + FileFd Pkg; + if (FileExists(*I) == true) + { + Pkg.Open(*I,FileFd::ReadOnly); + FileSize = Pkg.Size(); + } + else + { + FileFd From(*I + ".gz",FileFd::ReadOnly); + if (_error->PendingError() == true) + return false; + FileSize = From.Size(); + + // Get a temp file + FILE *tmp = tmpfile(); + if (tmp == 0) + return _error->Errno("tmpfile","Unable to create a tmp file"); + Pkg.Fd(dup(fileno(tmp))); + fclose(tmp); + + // Fork gzip + pid_t Process = fork(); + if (Process < 0) + return _error->Errno("fork","Couldn't fork gzip"); + + // The child + if (Process == 0) + { + dup2(From.Fd(),STDIN_FILENO); + dup2(Pkg.Fd(),STDOUT_FILENO); + SetCloseExec(STDIN_FILENO,false); + SetCloseExec(STDOUT_FILENO,false); + + const char *Args[3]; + string Tmp = _config->Find("Dir::bin::gzip","gzip"); + Args[0] = Tmp.c_str(); + Args[1] = "-d"; + Args[2] = 0; + execvp(Args[0],(char **)Args); + exit(100); + } + + // Wait for gzip to finish + if (ExecWait(Process,_config->Find("Dir::bin::gzip","gzip").c_str(),false) == false) + return _error->Error("gzip failed, perhaps the disk is full."); + + Pkg.Seek(0); + } + pkgTagFile Parser(&Pkg); + if (_error->PendingError() == true) + return false; + + // Open the output file + char S[400]; + snprintf(S,sizeof(S),"cdrom:[%s]/%s",Name.c_str(), + (*I).c_str() + CDROM.length()); + string TargetF = _config->FindDir("Dir::State::lists") + "partial/"; + TargetF += URItoFileName(S); + if (_config->FindB("APT::CDROM::NoAct",false) == true) + TargetF = "/dev/null"; + FileFd Target(TargetF,FileFd::WriteEmpty); + FILE *TargetFl = fdopen(dup(Target.Fd()),"w"); + if (_error->PendingError() == true) + return false; + if (TargetFl == 0) + return _error->Errno("fdopen","Failed to reopen fd"); + + // Setup the progress meter + if(Progress) + Progress->OverallProgress(CurrentSize,TotalSize,FileSize, + string("Reading Translation Indexes")); + + // Parse + if(Progress) + Progress->SubProgress(Pkg.Size()); + pkgTagSection Section; + this->Section = &Section; + string Prefix; + unsigned long Hits = 0; + unsigned long Chop = 0; + while (Parser.Step(Section) == true) + { + if(Progress) + Progress->Progress(Parser.Offset()); + + const char *Start; + const char *Stop; + Section.GetSection(Start,Stop); + fwrite(Start,Stop-Start, 1, TargetFl); + fputc('\n',TargetFl); + + Packages++; + Hits++; + } + fclose(TargetFl); + + if (Debug == true) + cout << " Processed by using Prefix '" << Prefix << "' and chop " << Chop << endl; + + if (_config->FindB("APT::CDROM::NoAct",false) == false) + { + // Move out of the partial directory + Target.Close(); + string FinalF = _config->FindDir("Dir::State::lists"); + FinalF += URItoFileName(S); + if (rename(TargetF.c_str(),FinalF.c_str()) != 0) + return _error->Errno("rename","Failed to rename"); + } + + + CurrentSize += FileSize; + } + if(Progress) + Progress->Done(); + + // Some stats + if(log) { + stringstream msg; + if(NotFound == 0 && WrongSize == 0) + ioprintf(msg, _("Wrote %i records.\n"), Packages); + else if (NotFound != 0 && WrongSize == 0) + ioprintf(msg, _("Wrote %i records with %i missing files.\n"), + Packages, NotFound); + else if (NotFound == 0 && WrongSize != 0) + ioprintf(msg, _("Wrote %i records with %i mismatched files\n"), + Packages, WrongSize); + if (NotFound != 0 && WrongSize != 0) + ioprintf(msg, _("Wrote %i records with %i missing files and %i mismatched files\n"), Packages, NotFound, WrongSize); + } + + if (Packages == 0) + _error->Warning("No valid records were found."); + + if (NotFound + WrongSize > 10) + _error->Warning("Alot of entries were discarded, something may be wrong.\n"); + + + return true; +} diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h index 4dcb2b46d..7778ae595 100644 --- a/apt-pkg/indexcopy.h +++ b/apt-pkg/indexcopy.h @@ -70,6 +70,17 @@ class SourceCopy : public IndexCopy public: }; +class TranslationsCopy +{ + protected: + pkgTagSection *Section; + + public: + bool CopyTranslations(string CDROM,string Name,vector<string> &List, + pkgCdromStatus *log); +}; + + class SigVerify { bool Verify(string prefix,string file, indexRecords *records); @@ -81,4 +92,6 @@ class SigVerify vector<string> PkgList,vector<string> SrcList); }; + + #endif diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc index 63f692c1d..ca11fc111 100644 --- a/apt-pkg/indexfile.cc +++ b/apt-pkg/indexfile.cc @@ -8,8 +8,11 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ +#include <apt-pkg/configuration.h> #include <apt-pkg/indexfile.h> #include <apt-pkg/error.h> + +#include <clocale> /*}}}*/ // Global list of Item supported @@ -63,3 +66,63 @@ string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &Record, return string(); } /*}}}*/ +// IndexFile::TranslationsAvailable - Check if will use Translation /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgIndexFile::TranslationsAvailable() +{ + const string Translation = _config->Find("APT::Acquire::Translation"); + + if (Translation.compare("none") != 0) + return CheckLanguageCode(LanguageCode().c_str()); + else + return false; +} + /*}}}*/ +// IndexFile::CheckLanguageCode - Check the Language Code /*{{{*/ +// --------------------------------------------------------------------- +/* */ +/* common cases: de_DE, de_DE@euro, de_DE.UTF-8, de_DE.UTF-8@euro, + de_DE.ISO8859-1, tig_ER + more in /etc/gdm/locale.conf +*/ + +bool pkgIndexFile::CheckLanguageCode(const char *Lang) +{ + if (strlen(Lang) == 2 || (strlen(Lang) == 5 && Lang[2] == '_')) + return true; + + if (strcmp(Lang,"C") != 0) + _error->Warning("Wrong language code %s", Lang); + + return false; +} + /*}}}*/ +// IndexFile::LanguageCode - Return the Language Code /*{{{*/ +// --------------------------------------------------------------------- +/* return the language code */ +string pkgIndexFile::LanguageCode() +{ + const string Translation = _config->Find("APT::Acquire::Translation"); + + if (Translation.compare("environment") == 0) + { + string lang = std::setlocale(LC_MESSAGES,NULL); + + // we have a mapping of the language codes that contains all the language + // codes that need the country code as well + // (like pt_BR, pt_PT, sv_SE, zh_*, en_*) + char *need_full_langcode[] = { "pt","sv","zh","en", NULL }; + for(char **s = need_full_langcode;*s != NULL; s++) + if(lang.find(*s) == 0) + return lang.substr(0,5); + + if(lang.size() > 2) + return lang.substr(0,2); + else + return lang; + } + else + return Translation; +} + /*}}}*/ diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h index f1c0268b8..3cc501629 100644 --- a/apt-pkg/indexfile.h +++ b/apt-pkg/indexfile.h @@ -5,10 +5,11 @@ Index File - Abstraction for an index of archive/source file. - There are 3 primary sorts of index files, all represented by this + There are 4 primary sorts of index files, all represented by this class: Binary index files + Binary translation files Bianry index files decribing the local system Source index files @@ -77,6 +78,10 @@ class pkgIndexFile virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress &/*Prog*/) const {return true;}; virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; + static bool TranslationsAvailable(); + static bool CheckLanguageCode(const char *Lang); + static string LanguageCode(); + bool IsTrusted() const { return Trusted; }; pkgIndexFile(bool Trusted): Trusted(Trusted) {}; diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index b47378d4a..2f15486d9 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -14,6 +14,7 @@ #include <apti18n.h> #include <config.h> +#include <cstdlib> #include <sys/stat.h> /*}}}*/ @@ -40,6 +41,8 @@ bool pkgInitConfig(Configuration &Cnf) else Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU); Cnf.Set("APT::Build-Essential::", "build-essential"); + Cnf.Set("APT::Install-Recommends", false); + Cnf.Set("APT::Install-Suggests", false); Cnf.Set("Dir","/"); // State @@ -102,6 +105,9 @@ bool pkgInitConfig(Configuration &Cnf) bindtextdomain(textdomain(0),Cnf.FindDir("Dir::Locale").c_str()); } #endif + + // Translation + Cnf.Set("APT::Acquire::Translation", "environment"); return true; } diff --git a/apt-pkg/init.h b/apt-pkg/init.h index 8255b406a..bc0e55036 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 11 +#define APT_PKG_MAJOR 4 +#define APT_PKG_MINOR 4 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 7e5feae53..df9954f67 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.4 MINOR=0 SLIBS=$(PTHREADLIB) $(INTLLIBS) APT_DOMAIN:=libapt-pkg$(MAJOR) diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 7302f02b6..616714e29 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -488,11 +488,13 @@ bool pkgOrderList::VisitProvides(DepIterator D,bool Critical) continue; if (D->Type != pkgCache::Dep::Conflicts && + D->Type != pkgCache::Dep::DpkgBreaks && D->Type != pkgCache::Dep::Obsoletes && Cache[Pkg].InstallVer != *I) continue; if ((D->Type == pkgCache::Dep::Conflicts || + D->Type == pkgCache::Dep::DpkgBreaks || D->Type == pkgCache::Dep::Obsoletes) && (Version *)Pkg.CurrentVer() != *I) continue; @@ -627,6 +629,7 @@ bool pkgOrderList::DepUnPackCrit(DepIterator D) /* Forward critical dependencies MUST be correct before the package can be unpacked. */ if (D->Type != pkgCache::Dep::Conflicts && + D->Type != pkgCache::Dep::DpkgBreaks && D->Type != pkgCache::Dep::Obsoletes && D->Type != pkgCache::Dep::PreDepends) continue; @@ -665,7 +668,7 @@ bool pkgOrderList::DepUnPackCrit(DepIterator D) } return true; } - /*}}}*/ + // OrderList::DepUnPackPreD - Critical UnPacking ordering with depends /*{{{*/ // --------------------------------------------------------------------- /* Critical PreDepends (also configure immediate and essential) strives to @@ -800,9 +803,20 @@ bool pkgOrderList::DepUnPackDep(DepIterator D) return false; } else + { if (D->Type == pkgCache::Dep::Depends) if (VisitProvides(D,false) == false) return false; + + if (D->Type == pkgCache::Dep::DpkgBreaks) + { + if (CheckDep(D) == true) + continue; + + if (VisitNode(D.TargetPkg()) == false) + return false; + } + } } return true; } @@ -950,6 +964,7 @@ bool pkgOrderList::CheckDep(DepIterator D) /* Conflicts requires that all versions are not present, depends just needs one */ if (D->Type != pkgCache::Dep::Conflicts && + D->Type != pkgCache::Dep::DpkgBreaks && D->Type != pkgCache::Dep::Obsoletes) { /* Try to find something that does not have the after flag set diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 8b94e1206..10e2858ed 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -91,9 +91,10 @@ bool pkgPackageManager::GetArchives(pkgAcquire *Owner,pkgSourceList *Sources, be downloaded. */ bool pkgPackageManager::FixMissing() { + pkgDepCache::ActionGroup group(Cache); pkgProblemResolver Resolve(&Cache); List->SetFileList(FileNames); - + bool Bad = false; for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) { @@ -102,7 +103,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 @@ -627,14 +628,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(Debug) - std::clog << "OrderInstall() returned: " << Res << std::endl; - 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 35cdca913..53600fb61 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -25,7 +25,9 @@ #include <string> +#include <iostream> #include <apt-pkg/pkgcache.h> +#include <apt-pkg/depcache.h> using std::string; @@ -67,13 +69,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 5672e60a4..7e3b9d78c 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -21,6 +21,7 @@ /*}}}*/ // Include Files /*{{{*/ #include <apt-pkg/pkgcache.h> +#include <apt-pkg/indexfile.h> #include <apt-pkg/version.h> #include <apt-pkg/error.h> #include <apt-pkg/strutl.h> @@ -38,6 +39,7 @@ using std::string; + // Cache::Header::Header - Constructor /*{{{*/ // --------------------------------------------------------------------- /* Simply initialize the header */ @@ -47,7 +49,7 @@ pkgCache::Header::Header() /* Whenever the structures change the major version should be bumped, whenever the generator changes the minor version should be bumped. */ - MajorVersion = 4; + MajorVersion = 6; MinorVersion = 0; Dirty = false; @@ -55,17 +57,22 @@ pkgCache::Header::Header() PackageSz = sizeof(pkgCache::Package); PackageFileSz = sizeof(pkgCache::PackageFile); VersionSz = sizeof(pkgCache::Version); + DescriptionSz = sizeof(pkgCache::Description); DependencySz = sizeof(pkgCache::Dependency); ProvidesSz = sizeof(pkgCache::Provides); VerFileSz = sizeof(pkgCache::VerFile); + DescFileSz = sizeof(pkgCache::DescFile); PackageCount = 0; VersionCount = 0; + DescriptionCount = 0; DependsCount = 0; PackageFileCount = 0; VerFileCount = 0; + DescFileCount = 0; ProvidesCount = 0; MaxVerFileSize = 0; + MaxDescFileSize = 0; FileList = 0; StringList = 0; @@ -84,8 +91,10 @@ bool pkgCache::Header::CheckSizes(Header &Against) const PackageSz == Against.PackageSz && PackageFileSz == Against.PackageFileSz && VersionSz == Against.VersionSz && + DescriptionSz == Against.DescriptionSz && DependencySz == Against.DependencySz && VerFileSz == Against.VerFileSz && + DescFileSz == Against.DescFileSz && ProvidesSz == Against.ProvidesSz) return true; return false; @@ -110,8 +119,10 @@ bool pkgCache::ReMap() HeaderP = (Header *)Map.Data(); PkgP = (Package *)Map.Data(); VerFileP = (VerFile *)Map.Data(); + DescFileP = (DescFile *)Map.Data(); PkgFileP = (PackageFile *)Map.Data(); VerP = (Version *)Map.Data(); + DescP = (Description *)Map.Data(); ProvideP = (Provides *)Map.Data(); DepP = (Dependency *)Map.Data(); StringItemP = (StringItem *)Map.Data(); @@ -212,8 +223,8 @@ const char *pkgCache::DepType(unsigned char Type) { const char *Types[] = {"",_("Depends"),_("PreDepends"),_("Suggests"), _("Recommends"),_("Conflicts"),_("Replaces"), - _("Obsoletes")}; - if (Type < 8) + _("Obsoletes"),_("Breaks")}; + if (Type < sizeof(Types)/sizeof(*Types)) return Types[Type]; return ""; } @@ -230,11 +241,11 @@ const char *pkgCache::Priority(unsigned char Prio) return 0; } /*}}}*/ - // Bases for iterator classes /*{{{*/ void pkgCache::VerIterator::_dummy() {} void pkgCache::DepIterator::_dummy() {} void pkgCache::PrvIterator::_dummy() {} +void pkgCache::DescIterator::_dummy() {} /*}}}*/ // PkgIterator::operator ++ - Postfix incr /*{{{*/ // --------------------------------------------------------------------- @@ -276,10 +287,11 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const // DepIterator::IsCritical - Returns true if the dep is important /*{{{*/ // --------------------------------------------------------------------- /* Currently critical deps are defined as depends, predepends and - conflicts. */ + conflicts (including dpkg's Breaks fields). */ bool pkgCache::DepIterator::IsCritical() { if (Dep->Type == pkgCache::Dep::Conflicts || + Dep->Type == pkgCache::Dep::DpkgBreaks || Dep->Type == pkgCache::Dep::Obsoletes || Dep->Type == pkgCache::Dep::Depends || Dep->Type == pkgCache::Dep::PreDepends) @@ -365,6 +377,7 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets() continue; if ((Dep->Type == pkgCache::Dep::Conflicts || + Dep->Type == pkgCache::Dep::DpkgBreaks || Dep->Type == pkgCache::Dep::Obsoletes) && ParentPkg() == I.ParentPkg()) continue; @@ -381,6 +394,7 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets() continue; if ((Dep->Type == pkgCache::Dep::Conflicts || + Dep->Type == pkgCache::Dep::DpkgBreaks || Dep->Type == pkgCache::Dep::Obsoletes) && ParentPkg() == I.OwnerPkg()) continue; @@ -594,3 +608,20 @@ string pkgCache::PkgFileIterator::RelStr() return Res; } /*}}}*/ +// VerIterator::TranslatedDescription - Return the a DescIter for locale/*{{{*/ +// --------------------------------------------------------------------- +/* return a DescIter for the current locale or the default if none is + * found + */ +pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const +{ + pkgCache::DescIterator DescDefault = DescriptionList(); + pkgCache::DescIterator Desc = DescDefault; + for (; Desc.end() == false; Desc++) + if (pkgIndexFile::LanguageCode() == Desc.LanguageCode()) + break; + if (Desc.end() == true) Desc = DescDefault; + return Desc; +}; + + /*}}}*/ diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 8e7fc252c..83b7548a3 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -35,32 +35,42 @@ class pkgCache struct Package; struct PackageFile; struct Version; + struct Description; struct Provides; struct Dependency; struct StringItem; struct VerFile; + struct DescFile; // Iterators class PkgIterator; class VerIterator; + class DescIterator; class DepIterator; class PrvIterator; class PkgFileIterator; class VerFileIterator; + class DescFileIterator; friend class PkgIterator; friend class VerIterator; + friend class DescInterator; friend class DepIterator; friend class PrvIterator; friend class PkgFileIterator; friend class VerFileIterator; + friend class DescFileIterator; class Namespace; // These are all the constants used in the cache structures + + // WARNING - if you change these lists you must also edit + // the stringification in pkgcache.cc and also consider whether + // the cache file will become incompatible. struct Dep { enum DepType {Depends=1,PreDepends=2,Suggests=3,Recommends=4, - Conflicts=5,Replaces=6,Obsoletes=7}; + Conflicts=5,Replaces=6,Obsoletes=7,DpkgBreaks=8}; enum DepCompareOp {Or=0x10,NoOp=0,LessEq=0x1,GreaterEq=0x2,Less=0x3, Greater=0x4,Equals=0x5,NotEquals=0x6}; }; @@ -95,8 +105,10 @@ class pkgCache Header *HeaderP; Package *PkgP; VerFile *VerFileP; + DescFile *DescFileP; PackageFile *PkgFileP; Version *VerP; + Description *DescP; Provides *ProvideP; Dependency *DepP; StringItem *StringItemP; @@ -148,16 +160,20 @@ struct pkgCache::Header unsigned short PackageSz; unsigned short PackageFileSz; unsigned short VersionSz; + unsigned short DescriptionSz; unsigned short DependencySz; unsigned short ProvidesSz; unsigned short VerFileSz; + unsigned short DescFileSz; // Structure counts unsigned long PackageCount; unsigned long VersionCount; + unsigned long DescriptionCount; unsigned long DependsCount; unsigned long PackageFileCount; unsigned long VerFileCount; + unsigned long DescFileCount; unsigned long ProvidesCount; // Offsets @@ -166,10 +182,11 @@ struct pkgCache::Header map_ptrloc VerSysName; // StringTable map_ptrloc Architecture; // StringTable unsigned long MaxVerFileSize; + unsigned long MaxDescFileSize; /* Allocation pools, there should be one of these for each structure excluding the header */ - DynamicMMap::Pool Pools[7]; + DynamicMMap::Pool Pools[8]; // Rapid package name lookup map_ptrloc HashTable[2*1048]; @@ -190,7 +207,7 @@ struct pkgCache::Package map_ptrloc NextPackage; // Package map_ptrloc RevDepends; // Dependency map_ptrloc ProvidesList; // Provides - + // Install/Remove/Purge etc unsigned char SelectedState; // What unsigned char InstState; // Flags @@ -229,6 +246,14 @@ struct pkgCache::VerFile unsigned short Size; }; +struct pkgCache::DescFile +{ + map_ptrloc File; // PackageFile + map_ptrloc NextFile; // PkgVerFile + map_ptrloc Offset; // File offset + unsigned short Size; +}; + struct pkgCache::Version { map_ptrloc VerStr; // Stringtable @@ -238,6 +263,7 @@ struct pkgCache::Version // Lists map_ptrloc FileList; // VerFile map_ptrloc NextVer; // Version + map_ptrloc DescriptionList; // Description map_ptrloc DependsList; // Dependency map_ptrloc ParentPkg; // Package map_ptrloc ProvidesList; // Provides @@ -249,6 +275,22 @@ struct pkgCache::Version unsigned char Priority; }; +struct pkgCache::Description +{ + // Language Code store the description translation language code. If + // the value has a 0 lenght then this is readed using the Package + // file else the Translation-CODE are used. + map_ptrloc language_code; // StringTable + map_ptrloc md5sum; // StringTable + + // Linked list + map_ptrloc FileList; // DescFile + map_ptrloc NextDesc; // Description + map_ptrloc ParentPkg; // Package + + unsigned short ID; +}; + struct pkgCache::Dependency { map_ptrloc Version; // Stringtable @@ -296,11 +338,13 @@ class pkgCache::Namespace typedef pkgCache::PkgIterator PkgIterator; typedef pkgCache::VerIterator VerIterator; + typedef pkgCache::DescIterator DescIterator; typedef pkgCache::DepIterator DepIterator; typedef pkgCache::PrvIterator PrvIterator; typedef pkgCache::PkgFileIterator PkgFileIterator; typedef pkgCache::VerFileIterator VerFileIterator; typedef pkgCache::Version Version; + typedef pkgCache::Description Description; typedef pkgCache::Package Package; typedef pkgCache::Header Header; typedef pkgCache::Dep Dep; diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 1c93b32a3..ce9b96980 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -22,6 +22,8 @@ #include <apt-pkg/sptr.h> #include <apt-pkg/pkgsystem.h> +#include <apt-pkg/tagfile.h> + #include <apti18n.h> #include <vector> @@ -121,16 +123,46 @@ bool pkgCacheGenerator::MergeList(ListParser &List, string Version = List.Version(); if (Version.empty() == true) { + // we first process the package, then the descriptions + // (this has the bonus that we get MMap error when we run out + // of MMap space) if (List.UsePackage(Pkg,pkgCache::VerIterator(Cache)) == false) return _error->Error(_("Error occurred while processing %s (UsePackage1)"), PackageName.c_str()); + + // Find the right version to write the description + MD5SumValue CurMd5 = List.Description_md5(); + pkgCache::VerIterator Ver = Pkg.VersionList(); + map_ptrloc *LastVer = &Pkg->VersionList; + + for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) + { + pkgCache::DescIterator Desc = Ver.DescriptionList(); + map_ptrloc *LastDesc = &Ver->DescriptionList; + + for (; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++) + { + + if (MD5SumValue(Desc.md5()) == CurMd5) + { + // Add new description + *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), CurMd5, *LastDesc); + Desc->ParentPkg = Pkg.Index(); + + if (NewFileDesc(Desc,List) == false) + return _error->Error(_("Error occured while processing %s (NewFileDesc1)"),PackageName.c_str()); + break; + } + } + } + continue; } pkgCache::VerIterator Ver = Pkg.VersionList(); - map_ptrloc *Last = &Pkg->VersionList; + map_ptrloc *LastVer = &Pkg->VersionList; int Res = 1; - for (; Ver.end() == false; Last = &Ver->NextVer, Ver++) + for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) { Res = Cache.VS->CmpVersion(Version,Ver.VerStr()); if (Res >= 0) @@ -164,7 +196,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, // Skip to the end of the same version set. if (Res == 0) { - for (; Ver.end() == false; Last = &Ver->NextVer, Ver++) + for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) { Res = Cache.VS->CmpVersion(Version,Ver.VerStr()); if (Res != 0) @@ -173,9 +205,10 @@ bool pkgCacheGenerator::MergeList(ListParser &List, } // Add a new version - *Last = NewVersion(Ver,Version,*Last); + *LastVer = NewVersion(Ver,Version,*LastVer); Ver->ParentPkg = Pkg.Index(); Ver->Hash = Hash; + if (List.NewVersion(Ver) == false) return _error->Error(_("Error occurred while processing %s (NewVersion1)"), PackageName.c_str()); @@ -195,6 +228,21 @@ bool pkgCacheGenerator::MergeList(ListParser &List, FoundFileDeps |= List.HasFileDeps(); return true; } + + /* Record the Description data. Description data always exist in + Packages and Translation-* files. */ + pkgCache::DescIterator Desc = Ver.DescriptionList(); + map_ptrloc *LastDesc = &Ver->DescriptionList; + + // Skip to the end of description set + for (; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++); + + // Add new description + *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), List.Description_md5(), *LastDesc); + Desc->ParentPkg = Pkg.Index(); + + if (NewFileDesc(Desc,List) == false) + return _error->Error(_("Error occured while processing %s (NewFileDesc2)"),PackageName.c_str()); } FoundFileDeps |= List.HasFileDeps(); @@ -205,6 +253,9 @@ bool pkgCacheGenerator::MergeList(ListParser &List, if (Cache.HeaderP->VersionCount >= (1ULL<<(sizeof(Cache.VerP->ID)*8))-1) return _error->Error(_("Wow, you exceeded the number of versions " "this APT is capable of.")); + if (Cache.HeaderP->DescriptionCount >= (1ULL<<(sizeof(Cache.DescP->ID)*8))-1) + return _error->Error(_("Wow, you exceeded the number of descriptions " + "this APT is capable of.")); if (Cache.HeaderP->DependsCount >= (1ULL<<(sizeof(Cache.DepP->ID)*8))-1ULL) return _error->Error(_("Wow, you exceeded the number of dependencies " "this APT is capable of.")); @@ -267,7 +318,7 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name Pkg = Cache.FindPkg(Name); if (Pkg.end() == false) return true; - + // Get a structure unsigned long Package = Map.Allocate(sizeof(pkgCache::Package)); if (Package == 0) @@ -345,6 +396,62 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver, return Version; } /*}}}*/ +// CacheGenerator::NewFileDesc - Create a new File<->Desc association /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc, + ListParser &List) +{ + if (CurrentFile == 0) + return true; + + // Get a structure + unsigned long DescFile = Map.Allocate(sizeof(pkgCache::DescFile)); + if (DescFile == 0) + return 0; + + pkgCache::DescFileIterator DF(Cache,Cache.DescFileP + DescFile); + DF->File = CurrentFile - Cache.PkgFileP; + + // Link it to the end of the list + map_ptrloc *Last = &Desc->FileList; + for (pkgCache::DescFileIterator D = Desc.FileList(); D.end() == false; D++) + Last = &D->NextFile; + + DF->NextFile = *Last; + *Last = DF.Index(); + + DF->Offset = List.Offset(); + DF->Size = List.Size(); + if (Cache.HeaderP->MaxDescFileSize < DF->Size) + Cache.HeaderP->MaxDescFileSize = DF->Size; + Cache.HeaderP->DescFileCount++; + + return true; +} + /*}}}*/ +// CacheGenerator::NewDescription - Create a new Description /*{{{*/ +// --------------------------------------------------------------------- +/* This puts a description structure in the linked list */ +map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, + const string &Lang, const MD5SumValue &md5sum, + map_ptrloc Next) +{ + // Get a structure + map_ptrloc Description = Map.Allocate(sizeof(pkgCache::Description)); + if (Description == 0) + return 0; + + // Fill it in + Desc = pkgCache::DescIterator(Cache,Cache.DescP + Description); + Desc->NextDesc = Next; + Desc->ID = Cache.HeaderP->DescriptionCount++; + Desc->language_code = Map.WriteString(Lang); + Desc->md5sum = Map.WriteString(md5sum.Value()); + + return Description; +} + /*}}}*/ // ListParser::NewDepends - Create a dependency element /*{{{*/ // --------------------------------------------------------------------- /* This creates a dependency element in the tree. It is linked to the @@ -567,8 +674,10 @@ static bool CheckValidity(const string &CacheFile, FileIterator Start, if ((*Start)->Exists() == false) { +#if 0 // mvo: we no longer give a message here (Default Sources spec) _error->WarningE("stat",_("Couldn't stat source package list %s"), (*Start)->Describe().c_str()); +#endif continue; } @@ -576,7 +685,7 @@ static bool CheckValidity(const string &CacheFile, FileIterator Start, pkgCache::PkgFileIterator File = (*Start)->FindInCache(Cache); if (File.end() == true) return false; - + Visited[File->ID] = true; } @@ -672,7 +781,7 @@ static bool BuildCache(pkgCacheGenerator &Gen, bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, MMap **OutMap,bool AllowMem) { - unsigned long MapSize = _config->FindI("APT::Cache-Limit",12*1024*1024); + unsigned long MapSize = _config->FindI("APT::Cache-Limit",16*1024*1024); vector<pkgIndexFile *> Files; for (vector<metaIndex *>::const_iterator i = List.begin(); @@ -819,7 +928,7 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, /* */ bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap) { - unsigned long MapSize = _config->FindI("APT::Cache-Limit",8*1024*1024); + unsigned long MapSize = _config->FindI("APT::Cache-Limit",12*1024*1024); vector<pkgIndexFile *> Files; unsigned long EndOfSource = Files.size(); if (_system->AddStatusFiles(Files) == false) diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 70616c0a8..a47b097b3 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -21,6 +21,7 @@ #include <apt-pkg/pkgcache.h> +#include <apt-pkg/md5.h> class pkgSourceList; class OpProgress; @@ -52,7 +53,9 @@ class pkgCacheGenerator 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,const string &VerStr,unsigned long Next); + map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const string &Lang,const MD5SumValue &md5sum,map_ptrloc Next); public: @@ -105,6 +108,9 @@ class pkgCacheGenerator::ListParser virtual string Package() = 0; virtual string Version() = 0; virtual bool NewVersion(pkgCache::VerIterator Ver) = 0; + virtual string Description() = 0; + virtual string DescriptionLanguage() = 0; + virtual MD5SumValue Description_md5() = 0; virtual unsigned short VersionHash() = 0; virtual bool UsePackage(pkgCache::PkgIterator Pkg, pkgCache::VerIterator Ver) = 0; diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc index dc43735a6..0aaa2096a 100644 --- a/apt-pkg/pkgrecords.cc +++ b/apt-pkg/pkgrecords.cc @@ -60,3 +60,12 @@ pkgRecords::Parser &pkgRecords::Lookup(pkgCache::VerFileIterator const &Ver) return *Files[Ver.File()->ID]; } /*}}}*/ +// Records::Lookup - Get a parser for the package description file /*{{{*/ +// --------------------------------------------------------------------- +/* */ +pkgRecords::Parser &pkgRecords::Lookup(pkgCache::DescFileIterator const &Desc) +{ + Files[Desc.File()->ID]->Jump(Desc); + return *Files[Desc.File()->ID]; +} + /*}}}*/ diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h index d431101fe..ea1a23fc4 100644 --- a/apt-pkg/pkgrecords.h +++ b/apt-pkg/pkgrecords.h @@ -35,6 +35,7 @@ class pkgRecords // Lookup function Parser &Lookup(pkgCache::VerFileIterator const &Ver); + Parser &Lookup(pkgCache::DescFileIterator const &Desc); // Construct destruct pkgRecords(pkgCache &Cache); @@ -46,6 +47,7 @@ class pkgRecords::Parser protected: virtual bool Jump(pkgCache::VerFileIterator const &Ver) = 0; + virtual bool Jump(pkgCache::DescFileIterator const &Desc) = 0; public: friend class pkgRecords; @@ -55,6 +57,7 @@ class pkgRecords::Parser virtual string MD5Hash() {return string();}; virtual string SHA1Hash() {return string();}; virtual string SourcePkg() {return string();}; + virtual string SourceVer() {return string();}; // These are some general stats about the package virtual string Maintainer() {return string();}; diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index 795f1d787..8b083fd44 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -33,6 +33,7 @@ #include <apti18n.h> #include <iostream> +#include <sstream> /*}}}*/ using namespace std; @@ -297,7 +298,13 @@ bool ReadPinFile(pkgPolicy &Plcy,string File) continue; } - Plcy.CreatePin(Type,Name,string(Word,End),priority); + istringstream s(Name); + string pkg; + while(!s.eof()) + { + s >> pkg; + Plcy.CreatePin(Type, pkg, string(Word,End),priority); + }; } Plcy.InitDefaults(); diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index 85e6abfd7..893cb8ee7 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -419,6 +419,7 @@ static const char *iTFRewritePackageOrder[] = { "Recommends", "Suggests", "Conflicts", + "Breaks", "Conffiles", "Filename", "Size", diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc index 72694dd75..8e5d09e8a 100644 --- a/apt-pkg/vendorlist.cc +++ b/apt-pkg/vendorlist.cc @@ -113,7 +113,7 @@ bool pkgVendorList::CreateList(Configuration& Cnf) const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint) { - for (const_iterator I = begin(); I != end(); ++I) + for (const_iterator I = VendorList.begin(); I != VendorList.end(); ++I) { if ((*I)->LookupFingerprint(Fingerprint) != "") return *I; diff --git a/buildlib/archtable b/buildlib/archtable index 197529202..eacc9889f 100644 --- a/buildlib/archtable +++ b/buildlib/archtable @@ -22,8 +22,12 @@ mips mips sheb sheb shel sh sh sh +sh3 sh3 +sh4 sh4 +m32r m32r hppa.* hppa ia64 ia64 s390 s390 s390x s390x x86_64 amd64 +# lipa has gnulp-linux-i.86 (see dpkg archtable and ostable) 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/sizetable b/buildlib/sizetable index 8b18528cf..b5782360c 100644 --- a/buildlib/sizetable +++ b/buildlib/sizetable @@ -21,3 +21,4 @@ m68k big 1 4 2 4 powerpc big 1 4 2 4 mips big 1 4 2 4 hppa big 1 4 2 4 +m32r big 1 4 2 4
\ No newline at end of file diff --git a/buildlib/systemtable b/buildlib/systemtable new file mode 100644 index 000000000..64c176b50 --- /dev/null +++ b/buildlib/systemtable @@ -0,0 +1,11 @@ +# This file contains a table of known canonical system strings, with +# things to map them to. `configure' will take the output of the +# autoconf cannon macros and look in here. It will check for +# the full canonical system name (required for e.g. lpia) and if that +# fails it will configure.in will fallback to just checking for the CPU +# in buildlib/archtable + +# The left side is a regex for awk against the canonical system name + +# config.guess reports lpia as i386-unknown-linux-gnulp +i.86-.*-linux-gnulp lpia diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index aea9ebeba..cc4c1559e 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -71,6 +71,12 @@ void LocalitySort(pkgCache::VerFile **begin, { qsort(begin,Count,Size,LocalityCompare); } + +void LocalitySort(pkgCache::DescFile **begin, + unsigned long Count,size_t Size) +{ + qsort(begin,Count,Size,LocalityCompare); +} /*}}}*/ // UnMet - Show unmet dependencies /*{{{*/ // --------------------------------------------------------------------- @@ -96,13 +102,15 @@ bool UnMet(CommandLine &CmdL) if (End->Type != pkgCache::Dep::PreDepends && End->Type != pkgCache::Dep::Depends && End->Type != pkgCache::Dep::Suggests && - End->Type != pkgCache::Dep::Recommends) + End->Type != pkgCache::Dep::Recommends && + End->Type != pkgCache::Dep::DpkgBreaks) continue; // Important deps only if (Important == true) if (End->Type != pkgCache::Dep::PreDepends && - End->Type != pkgCache::Dep::Depends) + End->Type != pkgCache::Dep::Depends && + End->Type != pkgCache::Dep::DpkgBreaks) continue; // Verify the or group @@ -182,7 +190,14 @@ bool DumpPackage(CommandLine &CmdL) { cout << Cur.VerStr(); for (pkgCache::VerFileIterator Vf = Cur.FileList(); Vf.end() == false; Vf++) - cout << "(" << Vf.File().FileName() << ")"; + cout << " (" << Vf.File().FileName() << ")"; + cout << endl; + for (pkgCache::DescIterator D = Cur.DescriptionList(); D.end() == false; D++) + { + cout << " Description Language: " << D.LanguageCode() << endl + << " File: " << D.FileList().File().FileName() << endl + << " MD5: " << D.md5() << endl; + } cout << endl; } @@ -277,11 +292,15 @@ bool Stats(CommandLine &Cmd) cout << _("Total distinct versions: ") << Cache.Head().VersionCount << " (" << SizeToStr(Cache.Head().VersionCount*Cache.Head().VersionSz) << ')' << endl; + cout << _("Total Distinct Descriptions: ") << Cache.Head().DescriptionCount << " (" << + SizeToStr(Cache.Head().DescriptionCount*Cache.Head().DescriptionSz) << ')' << endl; cout << _("Total dependencies: ") << Cache.Head().DependsCount << " (" << SizeToStr(Cache.Head().DependsCount*Cache.Head().DependencySz) << ')' << endl; cout << _("Total ver/file relations: ") << Cache.Head().VerFileCount << " (" << SizeToStr(Cache.Head().VerFileCount*Cache.Head().VerFileSz) << ')' << endl; + cout << _("Total Desc/File relations: ") << Cache.Head().DescFileCount << " (" << + SizeToStr(Cache.Head().DescFileCount*Cache.Head().DescFileSz) << ')' << endl; cout << _("Total Provides mappings: ") << Cache.Head().ProvidesCount << " (" << SizeToStr(Cache.Head().ProvidesCount*Cache.Head().ProvidesSz) << ')' << endl; @@ -344,6 +363,12 @@ bool Dump(CommandLine &Cmd) for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; D++) cout << " Depends: " << D.TargetPkg().Name() << ' ' << DeNull(D.TargetVer()) << endl; + for (pkgCache::DescIterator D = V.DescriptionList(); D.end() == false; D++) + { + cout << " Description Language: " << D.LanguageCode() << endl + << " File: " << D.FileList().File().FileName() << endl + << " MD5: " << D.md5() << endl; + } } } @@ -846,6 +871,7 @@ bool XVcg(CommandLine &CmdL) then show the relation but do not recurse */ if (Hit == false && (D->Type == pkgCache::Dep::Conflicts || + D->Type == pkgCache::Dep::DpkgBreaks || D->Type == pkgCache::Dep::Obsoletes)) { if (Show[D.TargetPkg()->ID] == None && @@ -867,6 +893,9 @@ bool XVcg(CommandLine &CmdL) case pkgCache::Dep::Conflicts: printf("label: \"conflicts\" color: lightgreen }\n"); break; + case pkgCache::Dep::DpkgBreaks: + printf("label: \"breaks\" color: lightgreen }\n"); + break; case pkgCache::Dep::Obsoletes: printf("label: \"obsoletes\" color: lightgreen }\n"); break; @@ -1192,17 +1221,50 @@ bool DisplayRecord(pkgCache::VerIterator V) if (_error->PendingError() == true) return false; - // Read the record and then write it out again. + // Read the record unsigned char *Buffer = new unsigned char[GCache->HeaderP->MaxVerFileSize+1]; Buffer[V.FileList()->Size] = '\n'; if (PkgF.Seek(V.FileList()->Offset) == false || - PkgF.Read(Buffer,V.FileList()->Size) == false || - fwrite(Buffer,1,V.FileList()->Size+1,stdout) < (size_t)(V.FileList()->Size+1)) + PkgF.Read(Buffer,V.FileList()->Size) == false) { delete [] Buffer; return false; } - + + // Get a pointer to start of Description field + const unsigned char *DescP = (unsigned char*)strstr((char*)Buffer, "Description:"); + + // Write all but Description + if (fwrite(Buffer,1,DescP - Buffer,stdout) < (size_t)(DescP - Buffer)) + { + delete [] Buffer; + return false; + } + + // Show the right description + pkgRecords Recs(*GCache); + pkgCache::DescIterator Desc = V.TranslatedDescription(); + pkgRecords::Parser &P = Recs.Lookup(Desc.FileList()); + cout << "Description" << ( (strcmp(Desc.LanguageCode(),"") != 0) ? "-" : "" ) << Desc.LanguageCode() << ": " << P.LongDesc(); + + // Find the first field after the description (if there is any) + for(DescP++;DescP != &Buffer[V.FileList()->Size];DescP++) + { + if(*DescP == '\n' && *(DescP+1) != ' ') + { + // write the rest of the buffer + const unsigned char *end=&Buffer[V.FileList()->Size]; + if (fwrite(DescP,1,end-DescP,stdout) < (size_t)(end-DescP)) + { + delete [] Buffer; + return false; + } + + break; + } + } + // write a final newline (after the description) + cout<<endl; delete [] Buffer; return true; @@ -1211,9 +1273,9 @@ bool DisplayRecord(pkgCache::VerIterator V) // Search - Perform a search /*{{{*/ // --------------------------------------------------------------------- /* This searches the package names and pacakge descriptions for a pattern */ -struct ExVerFile +struct ExDescFile { - pkgCache::VerFile *Vf; + pkgCache::DescFile *Df; bool NameMatch; }; @@ -1253,35 +1315,35 @@ bool Search(CommandLine &CmdL) return false; } - ExVerFile *VFList = new ExVerFile[Cache.HeaderP->PackageCount+1]; - memset(VFList,0,sizeof(*VFList)*Cache.HeaderP->PackageCount+1); + ExDescFile *DFList = new ExDescFile[Cache.HeaderP->PackageCount+1]; + memset(DFList,0,sizeof(*DFList)*Cache.HeaderP->PackageCount+1); // Map versions that we want to write out onto the VerList array. for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) { - VFList[P->ID].NameMatch = NumPatterns != 0; + DFList[P->ID].NameMatch = NumPatterns != 0; for (unsigned I = 0; I != NumPatterns; I++) { if (regexec(&Patterns[I],P.Name(),0,0,0) == 0) - VFList[P->ID].NameMatch &= true; + DFList[P->ID].NameMatch &= true; else - VFList[P->ID].NameMatch = false; + DFList[P->ID].NameMatch = false; } // Doing names only, drop any that dont match.. - if (NamesOnly == true && VFList[P->ID].NameMatch == false) + if (NamesOnly == true && DFList[P->ID].NameMatch == false) continue; // Find the proper version to use. pkgCache::VerIterator V = Plcy.GetCandidateVer(P); if (V.end() == false) - VFList[P->ID].Vf = V.FileList(); + DFList[P->ID].Df = V.DescriptionList().FileList(); } // Include all the packages that provide matching names too for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) { - if (VFList[P->ID].NameMatch == false) + if (DFList[P->ID].NameMatch == false) continue; for (pkgCache::PrvIterator Prv = P.ProvidesList() ; Prv.end() == false; Prv++) @@ -1289,18 +1351,18 @@ bool Search(CommandLine &CmdL) pkgCache::VerIterator V = Plcy.GetCandidateVer(Prv.OwnerPkg()); if (V.end() == false) { - VFList[Prv.OwnerPkg()->ID].Vf = V.FileList(); - VFList[Prv.OwnerPkg()->ID].NameMatch = true; + DFList[Prv.OwnerPkg()->ID].Df = V.DescriptionList().FileList(); + DFList[Prv.OwnerPkg()->ID].NameMatch = true; } } } - - LocalitySort(&VFList->Vf,Cache.HeaderP->PackageCount,sizeof(*VFList)); + + LocalitySort(&DFList->Df,Cache.HeaderP->PackageCount,sizeof(*DFList)); // Iterate over all the version records and check them - for (ExVerFile *J = VFList; J->Vf != 0; J++) + for (ExDescFile *J = DFList; J->Df != 0; J++) { - pkgRecords::Parser &P = Recs.Lookup(pkgCache::VerFileIterator(Cache,J->Vf)); + pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(Cache,J->Df)); bool Match = true; if (J->NameMatch == false) @@ -1331,7 +1393,7 @@ bool Search(CommandLine &CmdL) } } - delete [] VFList; + delete [] DFList; for (unsigned I = 0; I != NumPatterns; I++) regfree(&Patterns[I]); if (ferror(stdout)) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 64882e3e8..1dcbbfc5b 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -60,6 +60,7 @@ #include <errno.h> #include <regex.h> #include <sys/wait.h> +#include <sstream> /*}}}*/ using namespace std; @@ -628,6 +629,8 @@ void CacheFile::Sort() and verifies that the system is OK. */ bool CacheFile::CheckDeps(bool AllowBroken) { + bool FixBroken = _config->FindB("APT::Get::Fix-Broken",false); + if (_error->PendingError() == true) return false; @@ -639,12 +642,24 @@ bool CacheFile::CheckDeps(bool AllowBroken) if (pkgApplyStatus(*DCache) == false) return false; + if (_config->FindB("APT::Get::Fix-Policy-Broken",false) == true) + { + FixBroken = true; + if ((DCache->PolicyBrokenCount() > 0)) + { + // upgrade all policy-broken packages with ForceImportantDeps=True + for (pkgCache::PkgIterator I = Cache->PkgBegin(); !I.end(); I++) + if ((*DCache)[I].NowPolicyBroken() == true) + DCache->MarkInstall(I,true,0, false, true); + } + } + // Nothing is broken if (DCache->BrokenCount() == 0 || AllowBroken == true) return true; // Attempt to fix broken things - if (_config->FindB("APT::Get::Fix-Broken",false) == true) + if (FixBroken == true) { c1out << _("Correcting dependencies...") << flush; if (pkgFixBroken(*DCache) == false || DCache->BrokenCount() != 0) @@ -995,7 +1010,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); @@ -1145,9 +1160,11 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, else ExpectedInst++; - // Install it with autoinstalling enabled. - if (State.InstBroken() == true && BrokenFix == false) + // Install it with autoinstalling enabled (if we not respect the minial + // required deps or the policy) + if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && BrokenFix == false) Cache.MarkInstall(Pkg,true); + return true; } /*}}}*/ @@ -1355,20 +1372,29 @@ bool DoUpdate(CommandLine &CmdL) return false; bool Failed = false; + bool TransientNetworkFailure = false; for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++) { if ((*I)->Status == pkgAcquire::Item::StatDone) continue; (*I)->Finished(); - + fprintf(stderr,_("Failed to fetch %s %s\n"),(*I)->DescURI().c_str(), (*I)->ErrorText.c_str()); + + if ((*I)->Status == pkgAcquire::Item::StatTransientNetworkError) + { + TransientNetworkFailure = true; + continue; + } + Failed = true; } // Clean out any old list files - if (!Failed && _config->FindB("APT::Get::List-Cleanup",true) == true) + if (!TransientNetworkFailure && + _config->FindB("APT::Get::List-Cleanup",true) == true) { if (Fetcher.Clean(_config->FindDir("Dir::State::lists")) == false || Fetcher.Clean(_config->FindDir("Dir::State::lists") + "partial/") == false) @@ -1380,12 +1406,81 @@ bool DoUpdate(CommandLine &CmdL) if (Cache.BuildCaches() == false) return false; - if (Failed == true) + if (TransientNetworkFailure == true) + _error->Warning(_("Some index files failed to download, they have been ignored, or old ones used instead.")); + else if (Failed == true) return _error->Error(_("Some index files failed to download, they have been ignored, or old ones used instead.")); - + return true; } /*}}}*/ +// DoAutomaticRemove - Remove all automatic unused packages /*{{{*/ +// --------------------------------------------------------------------- +/* Remove unused automatic packages */ +bool DoAutomaticRemove(CacheFile &Cache) +{ + bool Debug = _config->FindI("Debug::pkgAutoRemove",false); + bool doAutoRemove = _config->FindB("APT::Get::AutomaticRemove", false); + bool hideAutoRemove = _config->FindB("APT::Get::HideAutoRemove"); + pkgDepCache::ActionGroup group(*Cache); + + if(Debug) + std::cout << "DoAutomaticRemove()" << std::endl; + + if (_config->FindB("APT::Get::Remove",true) == false && + doAutoRemove == true) + { + c1out << _("We are not supposed to delete stuff, can't start " + "AutoRemover") << std::endl; + doAutoRemove = false; + } + + string autoremovelist, autoremoveversions; + // look over the cache to see what can be removed + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg) + { + if (Cache[Pkg].Garbage) + { + if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install()) + if(Debug) + std::cout << "We could delete %s" << Pkg.Name() << std::endl; + + // only show stuff in the list that is not yet marked for removal + if(Cache[Pkg].Delete() == false) + { + autoremovelist += string(Pkg.Name()) + " "; + autoremoveversions += string(Cache[Pkg].CandVersion) + "\n"; + } + if (doAutoRemove) + { + if(Pkg.CurrentVer() != 0 && + Pkg->CurrentState != pkgCache::State::ConfigFiles) + Cache->MarkDelete(Pkg, _config->FindB("APT::Get::Purge", false)); + else + Cache->MarkKeep(Pkg, false, false); + } + } + } + if (!hideAutoRemove) + ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions); + if (!doAutoRemove && !hideAutoRemove && autoremovelist.size() > 0) + c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl; + + // Now see if we destroyed anything + 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 @@ -1406,6 +1501,51 @@ bool DoUpgrade(CommandLine &CmdL) return InstallPackages(Cache,true); } /*}}}*/ +// DoInstallTask - Install task from the command line /*{{{*/ +// --------------------------------------------------------------------- +/* Install named task */ +bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, + bool BrokenFix, + unsigned int& ExpectedInst, + const char *taskname) +{ + const char *start, *end; + pkgCache::PkgIterator Pkg; + char buf[64*1024]; + regex_t Pattern; + + // get the records + pkgRecords Recs(Cache); + + // build regexp for the task + char S[300]; + snprintf(S, sizeof(S), "^Task:.*[^a-z]%s[^a-z].*\n", taskname); + regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE); + + bool found = false; + bool res = true; + for (Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + { + pkgCache::VerIterator ver = Cache[Pkg].CandidateVerIter(Cache); + if(ver.end()) + continue; + pkgRecords::Parser &parser = Recs.Lookup(ver.FileList()); + parser.GetRec(start,end); + strncpy(buf, start, end-start); + buf[end-start] = 0x0; + if (regexec(&Pattern,buf,0,0,0) != 0) + continue; + res &= TryToInstall(Pkg,Cache,Fix,false,BrokenFix,ExpectedInst); + found = true; + } + + if(!found) + _error->Error(_("Couldn't find task %s"),taskname); + + regfree(&Pattern); + return res; +} + // DoInstall - Install packages from the command line /*{{{*/ // --------------------------------------------------------------------- /* Install named packages */ @@ -1421,6 +1561,7 @@ bool DoInstall(CommandLine &CmdL) if (Cache->BrokenCount() != 0) BrokenFix = true; + unsigned int AutoMarkChanged = 0; unsigned int ExpectedInst = 0; unsigned int Packages = 0; pkgProblemResolver Fix(Cache); @@ -1428,155 +1569,185 @@ bool DoInstall(CommandLine &CmdL) bool DefRemove = false; if (strcasecmp(CmdL.FileList[0],"remove") == 0) DefRemove = true; - - for (const char **I = CmdL.FileList + 1; *I != 0; I++) + else if (strcasecmp(CmdL.FileList[0], "purge") == 0) { - // Duplicate the string - unsigned int Length = strlen(*I); - char S[300]; - if (Length >= sizeof(S)) - continue; - strcpy(S,*I); - - // See if we are removing and special indicators.. - bool Remove = DefRemove; - char *VerTag = 0; - bool VerIsRel = false; - while (Cache->FindPkg(S).end() == true) + _config->Set("APT::Get::Purge", true); + DefRemove = true; + } + else if (strcasecmp(CmdL.FileList[0], "autoremove") == 0) + { + _config->Set("APT::Get::AutomaticRemove", "true"); + DefRemove = true; + } + // new scope for the ActionGroup + { + pkgDepCache::ActionGroup group(Cache); + for (const char **I = CmdL.FileList + 1; *I != 0; I++) { - // Handle an optional end tag indicating what to do - if (Length >= 1 && S[Length - 1] == '-') - { - Remove = true; - S[--Length] = 0; + // Duplicate the string + unsigned int Length = strlen(*I); + char S[300]; + if (Length >= sizeof(S)) continue; - } - - if (Length >= 1 && S[Length - 1] == '+') + strcpy(S,*I); + + // See if we are removing and special indicators.. + bool Remove = DefRemove; + char *VerTag = 0; + bool VerIsRel = false; + while (Cache->FindPkg(S).end() == true) { - Remove = false; - S[--Length] = 0; - continue; - } + // Handle an optional end tag indicating what to do + if (Length >= 1 && S[Length - 1] == '-') + { + Remove = true; + S[--Length] = 0; + continue; + } - char *Slash = strchr(S,'='); - if (Slash != 0) - { - VerIsRel = false; - *Slash = 0; - VerTag = Slash + 1; - } + if (Length >= 1 && S[Length - 1] == '+') + { + Remove = false; + S[--Length] = 0; + continue; + } - Slash = strchr(S,'/'); - if (Slash != 0) - { - VerIsRel = true; - *Slash = 0; - VerTag = Slash + 1; - } + char *Slash = strchr(S,'='); + if (Slash != 0) + { + VerIsRel = false; + *Slash = 0; + VerTag = Slash + 1; + } - break; - } + Slash = strchr(S,'/'); + if (Slash != 0) + { + VerIsRel = true; + *Slash = 0; + VerTag = Slash + 1; + } + + break; + } - // Locate the package - pkgCache::PkgIterator Pkg = Cache->FindPkg(S); - Packages++; - if (Pkg.end() == true) - { - // Check if the name is a regex - const char *I; - for (I = S; *I != 0; I++) - if (*I == '?' || *I == '*' || *I == '|' || - *I == '[' || *I == '^' || *I == '$') - break; - if (*I == 0) - return _error->Error(_("Couldn't find package %s"),S); + // Locate the package + pkgCache::PkgIterator Pkg = Cache->FindPkg(S); + Packages++; + if (Pkg.end() == true) + { + // Check if the name is a regex + const char *I; + for (I = S; *I != 0; I++) + if (*I == '?' || *I == '*' || *I == '|' || + *I == '[' || *I == '^' || *I == '$') + break; + if (*I == 0) + return _error->Error(_("Couldn't find package %s"),S); - // Regexs must always be confirmed - ExpectedInst += 1000; + // Regexs must always be confirmed + ExpectedInst += 1000; - // Compile the regex pattern - regex_t Pattern; - int Res; - if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE | - REG_NOSUB)) != 0) - { - char Error[300]; - regerror(Res,&Pattern,Error,sizeof(Error)); - return _error->Error(_("Regex compilation error - %s"),Error); - } + // Compile the regex pattern + regex_t Pattern; + int Res; + if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE | + REG_NOSUB)) != 0) + { + char Error[300]; + regerror(Res,&Pattern,Error,sizeof(Error)); + return _error->Error(_("Regex compilation error - %s"),Error); + } - // Run over the matches - bool Hit = false; - for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) - { - if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0) - continue; + // Run over the matches + bool Hit = false; + for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) + { + if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0) + continue; - ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"), - Pkg.Name(),S); + ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"), + Pkg.Name(),S); + if (VerTag != 0) + if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false) + return false; + + Hit |= TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix, + ExpectedInst,false); + } + regfree(&Pattern); + + if (Hit == false) + return _error->Error(_("Couldn't find package %s"),S); + } + else + { if (VerTag != 0) if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false) return false; - - Hit |= TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix, - ExpectedInst,false); - } - regfree(&Pattern); - - if (Hit == false) - return _error->Error(_("Couldn't find package %s"),S); - } - else - { - if (VerTag != 0) - if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false) + if (TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,ExpectedInst) == false) return false; - if (TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,ExpectedInst) == false) - return false; - } - } - /* If we are in the Broken fixing mode we do not attempt to fix the - problems. This is if the user invoked install without -f and gave - packages */ - if (BrokenFix == true && Cache->BrokenCount() != 0) - { - c1out << _("You might want to run `apt-get -f install' to correct these:") << endl; - ShowBroken(c1out,Cache,false); + // see if we need to fix the auto-mark flag + // e.g. apt-get install foo + // where foo is marked automatic + if(!Remove && + Cache[Pkg].Install() == false && + (Cache[Pkg].Flags & pkgCache::Flag::Auto)) + { + ioprintf(c1out,_("%s set to manual installed.\n"), + Pkg.Name()); + Cache->MarkAuto(Pkg,false); + AutoMarkChanged++; + } + } + } - return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution).")); - } + /* If we are in the Broken fixing mode we do not attempt to fix the + problems. This is if the user invoked install without -f and gave + packages */ + if (BrokenFix == true && Cache->BrokenCount() != 0) + { + c1out << _("You might want to run `apt-get -f install' to correct these:") << endl; + ShowBroken(c1out,Cache,false); + + return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution).")); + } - // Call the scored problem resolver - Fix.InstallProtect(); - if (Fix.Resolve(true) == false) - _error->Discard(); + // Call the scored problem resolver + Fix.InstallProtect(); + if (Fix.Resolve(true) == false) + _error->Discard(); - // Now we check the state of the packages, - if (Cache->BrokenCount() != 0) - { - c1out << - _("Some packages could not be installed. This may mean that you have\n" - "requested an impossible situation or if you are using the unstable\n" - "distribution that some required packages have not yet been created\n" - "or been moved out of Incoming.") << endl; - if (Packages == 1) + // Now we check the state of the packages, + if (Cache->BrokenCount() != 0) { - c1out << endl; c1out << - _("Since you only requested a single operation it is extremely likely that\n" - "the package is simply not installable and a bug report against\n" - "that package should be filed.") << endl; - } + _("Some packages could not be installed. This may mean that you have\n" + "requested an impossible situation or if you are using the unstable\n" + "distribution that some required packages have not yet been created\n" + "or been moved out of Incoming.") << endl; + if (Packages == 1) + { + c1out << endl; + c1out << + _("Since you only requested a single operation it is extremely likely that\n" + "the package is simply not installable and a bug report against\n" + "that package should be filed.") << endl; + } + + c1out << _("The following information may help to resolve the situation:") << endl; + c1out << endl; + ShowBroken(c1out,Cache,false); + return _error->Error(_("Broken packages")); + } + } + if (_config->FindB("APT::Get::AutomaticRemove")) { + if (!DoAutomaticRemove(Cache)) + return false; + } - c1out << _("The following information may help to resolve the situation:") << endl; - c1out << endl; - ShowBroken(c1out,Cache,false); - return _error->Error(_("Broken packages")); - } - /* Print out a list of packages that are going to be installed extra to what the user asked */ if (Cache->InstCount() != ExpectedInst) @@ -1596,8 +1767,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); @@ -1694,6 +1865,14 @@ bool DoInstall(CommandLine &CmdL) } + // if nothing changed in the cache, but only the automark information + // we write the StateFile here, otherwise it will be written in + // cache.commit() + if (AutoMarkChanged > 0 && + Cache->DelCount() == 0 && Cache->InstCount() == 0 && + Cache->BadCount() == 0) + Cache->writeStateFile(NULL); + // See if we need to prompt if (Cache->InstCount() == ExpectedInst && Cache->DelCount() == 0) return InstallPackages(Cache,false,false); @@ -1732,6 +1911,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++) @@ -1950,6 +2131,11 @@ bool DoSource(CommandLine &CmdL) I->Type != "tar") continue; + // Dsc only mode only fetches .dsc files + if (_config->FindB("APT::Get::Dsc-Only",false) == true && + I->Type != "dsc") + 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()) @@ -2443,6 +2629,7 @@ bool ShowHelp(CommandLine &CmdL) " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" + " purge - Remove and purge 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" @@ -2484,6 +2671,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 /*{{{*/ @@ -2531,7 +2719,8 @@ int main(int argc,const char *argv[]) {0,"force-yes","APT::Get::force-yes",0}, {0,"print-uris","APT::Get::Print-URIs",0}, {0,"diff-only","APT::Get::Diff-Only",0}, - {0,"tar-only","APT::Get::tar-Only",0}, + {0,"tar-only","APT::Get::Tar-Only",0}, + {0,"dsc-only","APT::Get::Dsc-Only",0}, {0,"purge","APT::Get::Purge",0}, {0,"list-cleanup","APT::Get::List-Cleanup",0}, {0,"reinstall","APT::Get::ReInstall",0}, @@ -2539,7 +2728,10 @@ 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}, + {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean}, + {0,"fix-policy","APT::Get::Fix-Policy-Broken",0}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, {0,0,0,0}}; @@ -2547,6 +2739,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 7460a24be..90ecae2cf 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -24,9 +24,9 @@ update() { $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --ignore-time-conflict --import # remove no-longer used keys - keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys|awk '/^pub/{FS=":";print $5}'` + keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5` for key in $keys; do - if $GPG --list-keys --with-colons | awk '/^pub/{FS=":";print $5}'|grep -q $key; then + if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then $GPG --quiet --batch --delete-key --yes ${key} fi done diff --git a/cmdline/apt-mark b/cmdline/apt-mark new file mode 100755 index 000000000..dadc01366 --- /dev/null +++ b/cmdline/apt-mark @@ -0,0 +1,64 @@ +#!/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.chmod(outfile.name, 0644) + os.rename(outfile.name, STATE_FILE) diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc index e6a6b9a56..8909c3826 100644 --- a/cmdline/apt-sortpkgs.cc +++ b/cmdline/apt-sortpkgs.cc @@ -162,7 +162,7 @@ int ShowHelp() } /*}}}*/ -int main(unsigned int argc,const char *argv[]) +int main(int argc,const char *argv[]) { CommandLine::Args Args[] = { {'h',"help","help",0}, diff --git a/cmdline/makefile b/cmdline/makefile index 882a0e1b5..49035be44 100644 --- a/cmdline/makefile +++ b/cmdline/makefile @@ -52,3 +52,9 @@ SOURCE=apt-key TO=$(BIN) TARGET=program include $(COPY_H) + +# The apt-mark program +SOURCE=apt-mark +TO=$(BIN) +TARGET=program +include $(COPY_H) diff --git a/configure.in b/configure.in index 35d0ea5ee..34d4dcc78 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.45.1") +AC_DEFINE_UNQUOTED(VERSION,"0.7.2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) @@ -78,10 +78,15 @@ AC_SUBST(BDBLIB) dnl Converts the ARCH to be something singular for this general CPU family dnl This is often the dpkg architecture string. +dnl First check against the full canonical canoncial-system-type in $target +dnl and if that fails, just look for the cpu AC_MSG_CHECKING(system architecture) -archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target_cpu\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/archtable`" +archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/systemtable`" if test "x$archset" = "x"; then + archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target_cpu\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/archtable`" + if test "x$archset" = "x"; then AC_MSG_ERROR(failed: use --host= or check buildlib/archtable) + fi fi AC_MSG_RESULT($archset) AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset") @@ -175,12 +180,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 +206,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="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv tl vi zn_CN zh_TW" +ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv tl uk vi zn_CN zh_TW" AM_GNU_GETTEXT(external) if test x"$USE_NLS" = "xyes"; then AC_DEFINE(USE_NLS) @@ -200,4 +214,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.conf.autoremove b/debian/apt.conf.autoremove new file mode 100644 index 000000000..98143ce9a --- /dev/null +++ b/debian/apt.conf.autoremove @@ -0,0 +1,8 @@ +APT +{ + NeverAutoRemove + { + "^linux-image.*"; + "^linux-restricted-modules.*"; + }; +}; diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 26dfa2530..778e3cefe 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -14,6 +14,12 @@ # "APT::Periodic::AutocleanInterval" # - Do "apt-get autoclean" every n-days (0=disable) # +# "APT::Periodic::Unattended-Upgrade" +# - Run the "unattended-upgrade" security upgrade script +# every n-days (0=disabled) +# Requires the package "unattended-upgrades" and will write +# a log in /var/log/unattended-upgrades +# # "APT::Archives::MaxAge", # - Set maximum allowed age of a cache package file. If a cache # package file is older it is deleted (0=disable) @@ -146,7 +152,11 @@ UpdateInterval=0 DownloadUpgradeableInterval=0 eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages) AutocleanInterval=$DownloadUpgradeableInterval -eval $(apt-config shell AutocleanInterval APT::Periodic::Autoclean) +eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval) + +UnattendedUpgradeInterval=0 +eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade) + # laptop check, on_ac_power returns: # 0 (true) System is on mains power @@ -182,5 +192,11 @@ if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then update_stamp $AUTOCLEAN_STAMP fi +UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp +if check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then + unattended-upgrade + update_stamp $UPGRADE_STAMP +fi + # check cache size check_size_constraints diff --git a/debian/apt.dirs b/debian/apt.dirs index e1cb738fa..1543e8bb1 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -2,6 +2,7 @@ usr/bin usr/lib/apt/methods usr/lib/dpkg/methods/apt etc/apt +etc/apt/apt.conf.d etc/apt/sources.list.d var/cache/apt/archives/partial var/lib/apt/lists/partial diff --git a/debian/apt.postinst b/debian/apt.postinst index ae1801198..88fb932df 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -20,6 +20,8 @@ case "$1" in cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg fi + apt-key update + ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/changelog b/debian/changelog index 6aaa473d9..41609bd74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,207 @@ +apt (0.7.2) unstable; urgency=low + + * merged the debian/experimental changes back + into the debian/sid branch + * merged from Christian Perrier: + * mr.po: New Marathi translation Closes: #416806 + * zh_CN.po: Updated by Eric Pareja Closes: #416822 + * tl.po: Updated by Eric Pareja Closes: #416638 + * gl.po: Updated by Jacobo Tarrio + Closes: #412828 + * da.po: Updated by Claus Hindsgaul + Closes: #409483 + * fr.po: Remove a non-breakable space for usability + issues. Closes: #408877 + * ru.po: Updated Russian translation. Closes: #405476 + * *.po: Unfuzzy after upstream typo corrections + * buildlib/archtable: + - added support for sh3/sh4 (closes: #424870) + - added support for m32r (closes: #394096) + * buildlib/systemtable: + - added support for lpia + * configure.in: + - check systemtable for architecture mapping too + * fix error in AutocleanInterval, closes: #319339 + (thanks to Israel G. Lugo for the patch) + * add "purge" commandline argument, closes: #133421) + (thanks to Julien Danjou for the patch) + * add "purge" commandline argument, closes: #133421) + (thanks to Julien Danjou for the patch) + * fix FTBFS with gcc 4.3, closes: #417090 + (thanks to Martin Michlmayr for the patch) + * add --dsc-only option, thanks to K. Richard Pixley + * Removed the more leftover #pragma interface/implementation + closes: #306937 (thanks to Andreas Henriksson for the patch) + + -- Michael Vogt <mvo@debian.org> Wed, 06 Jun 2007 23:19:50 +0200 + +apt (0.7.1) experimental; urgency=low + + * ABI library name change because its build against + new glibc + * implement SourceVer() in pkgRecords + (thanks to Daniel Burrows for the patch!) + * apt-pkg/algorithm.cc: + - use clog for all debugging + - only increase the score of installed applications if they + are not obsolete + - fix resolver bug on removal triggered by weak-dependencies + with or-groups + * methods/http.cc: + - send apt version in User-Agent + * apt-pkg/deb/debrecords.cc: + - fix SHA1Hash() return value + * apt-pkg/cdrom.cc: + - only unmount if APT::CDROM::NoMount is false + * methods/cdrom.cc: + - only umount if it was mounted by the method before + * po/gl.po: + - fix error translation that causes trouble to lsb_release + * apt-pkg/acquire-item.cc: + - if decompression of a index fails, delete the index + * apt-pkg/acquire.{cc,h}: + - deal better with duplicated sources.list entries (avoid + double queuing of URLs) - this fixes hangs in bzip/gzip + * merged from Christian Perrier: + * mr.po: New Marathi translation Closes: #416806 + * zh_CN.po: Updated by Eric Pareja Closes: #416822 + * tl.po: Updated by Eric Pareja Closes: #416638 + * gl.po: Updated by Jacobo Tarrio + Closes: #412828 + * da.po: Updated by Claus Hindsgaul + Closes: #409483 + * fr.po: Remove a non-breakable space for usability + issues. Closes: #408877 + * ru.po: Updated Russian translation. Closes: #405476 + * *.po: Unfuzzy after upstream typo corrections + * vi.po: Updated to 515t. Closes: #426976 + * eu.po: Updated to 515t. Closes: #423766 + * pt.po: 515t. Closes: #423111 + * fr.po: Updated by Christian Perrier + * Update all PO and the POT. Gives 513t2f for formerly + complete translations + * apt-pkg/policy.cc: + - allow multiple packages (thanks to David Foerster) + + -- Michael Vogt <mvo@debian.org> Wed, 2 May 2007 13:43:44 +0200 + +apt (0.7.0) experimental; urgency=low + + * Package that contains tall the new features + * Removed all #pragma interface/implementation + * Branch that contains tall the new features: + * translated package descriptions + * task install support + * automatic dependency removal (thanks to Daniel Burrows) + * merged support for the new dpkg "Breaks" field + (thanks to Ian Jackson) + * handle network failures more gracefully on "update" + * support for unattended-upgrades (via unattended-upgrades + package) + * added apt-transport-https method + + -- Michael Vogt <mvo@debian.org> Fri, 12 Jan 2007 20:48:07 +0100 + +apt (0.6.46.4-0.1) unstable; urgency=emergency + + * NMU + * Fix broken use of awk in apt-key that caused removal of the wrong keys + from the keyring. Closes: #412572 + + -- Joey Hess <joeyh@debian.org> Mon, 26 Feb 2007 16:00:22 -0500 + +apt (0.6.46.4) unstable; urgency=high + + * ack NMU (closes: #401017) + * added apt-secure.8 to "See also" section + * apt-pkg/deb/dpkgpm.cc: + - added "Dpkg::StopOnError" variable that controls if apt + will abort on errors from dpkg + * apt-pkg/deb/debsrcrecords.{cc,h}: + - make the Buffer grow dynmaically (closes: #400874) + * Merged from Christian Perrier bzr branch: + - uk.po: New Ukrainian translation: 483t28f3u + - el.po: Update to 503t9f2u + - de.po: Updates and corrections. + * apt-pkg/contrib/progress.cc: + - OpProgress::CheckChange optimized, thanks to Paul Brook + (closes: #398381) + * apt-pkg/contrib/sha256.cc: + - fix building with noopt + + -- Michael Vogt <mvo@debian.org> Thu, 7 Dec 2006 10:49:50 +0100 + +apt (0.6.46.3-0.2) unstable; urgency=high + + * Non-maintainer upload with permission of Michael Vogt. + * Fix FTBFS on most arches (regression from the fix of #400874) + + -- Andreas Barth <aba@not.so.argh.org> Tue, 5 Dec 2006 15:51:22 +0000 + +apt (0.6.46.3-0.1) unstable; urgency=high + + * Non-maintainer upload with permission of Michael Vogt. + * Fix segfault at apt-get source. Closes: #400874 + * Add apt-key update in postinst, so that debian-archive-keyring doesn't + need to depend on apt >= 0.6. Closes: #401114 + * Don't double-queue pdiff files. Closes: #401017 + + -- Andreas Barth <aba@not.so.argh.org> Tue, 5 Dec 2006 10:34:56 +0000 + +apt (0.6.46.3) unstable; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - make progress reporting robust against multiline error + messages + + * Merged from Christian Perrier bzr branch: + - ca.po: Updated to 514t + - be.po: Updated to 514t + - it.po: Updated to 514t + - hu.po: Updated to 514t + - zh_TW.po: Updated to 514t + - ar.po: Updated to 293t221u. + - ru.po: Updated to 514t. Closes: #392466 + - nb.po: Updated to 514t. Closes: #392466 + - pt.po: Updated to 514t. Closes: #393199 + - fr.po: One spelling error corrected: s/accèder/accéder + - km.po: Updated to 514t. + - ko.po: Updated to 514t. + - bg.po: Updated to 514t. + - de.po: Updated to 514t. + - en_GB.po: Updated to 514t. + + -- Michael Vogt <mvo@debian.org> Thu, 2 Nov 2006 11:37:58 +0100 + +apt (0.6.46.2) unstable; urgency=low + + * debian/control: + - depend on debian-archive-keyring to offer clean upgrade path + (closes: #386800) + * Merged from Christian Perrier bzr branch: + - es.po: Updated to 514t. Closes: #391661 + - da.po: Updated to 514t. Closes: #391424 + - cs.po: Updated. Closes: #391064 + - es.po: Updated to 514t. Closes: #391661 + - da.po: Updated to 514t. Closes: #391424 + + -- Michael Vogt <mvo@debian.org> Wed, 11 Oct 2006 09:03:15 +0200 + apt (0.6.46.1) unstable; urgency=low + * merged "install-recommends" branch (ABI break): + - new "--install-recommends" + - install new recommends on "upgrade" if --install-recommends is + given + - new "--fix-policy" option to install all packages with unmet + important dependencies (usefull with --install-recommends to + see what not-installed recommends are on the system) + - fix of recommended packages display (only show CandidateVersion + fix or-group handling) + * merged "install-task" branch (use with "apt-get install taskname^") * methods/gzip.cc: - deal with empty files - * Applied patch from Daniel Schepler to make apt bin-NMU able. + * Applied patch from Daniel Schepler to make apt bin-NMU able. (closes: bug#359634) * rebuild against current g++ because of: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29289 @@ -16,7 +215,7 @@ apt (0.6.46.1) unstable; urgency=low * make the internal buffer in pkgTagFile grow dynamically (closes: #388708) - -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 2 Oct 2006 16:02:30 +0200 + -- Michael Vogt <mvo@debian.org> Mon, 2 Oct 2006 20:42:20 +0200 apt (0.6.46) unstable; urgency=low @@ -90,26 +289,42 @@ apt (0.6.45) unstable; urgency=low * dz.po: New Dzongkha translation: 512t * ro.po: Updated to 512t * eu.po: Updated + * eu.po: Updated + * 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 + * apt-pkg/tagfile.cc: + - support not-mmapable files again - -- Michael Vogt <mvo@debian.org> Thu, 27 Jul 2006 00:52:05 +0200 + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 25 Jul 2006 11:55:22 +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.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 @@ -121,22 +336,32 @@ apt (0.6.44.1-0.1) unstable; urgency=low 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) + - 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 @@ -331,7 +556,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 @@ -431,6 +656,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/control b/debian/control index 3cba50acb..5686926d4 100644 --- a/debian/control +++ b/debian/control @@ -3,18 +3,18 @@ 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.2.2 -Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12) +Standards-Version: 3.7.2.2 +Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl3-gnutls-dev (>= 7.15.5) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) +XS-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, debian-archive-keyring 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 +Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2 Section: admin Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. @@ -65,3 +65,12 @@ Description: APT utility programs apt-extracttemplates is used by debconf to prompt for configuration questions before installation. apt-ftparchive is used to create Package and other index files. apt-sortpkgs is a Package/Source file normalizer. + +Package: apt-transport-https +Architecture: any +Depends: ${shlibs:Depends} +Priority: optional +Section: admin +Description: APT https transport + This package contains a APT https transport. It makes it possible to + use 'deb https://foo distro main' lines in the sources.list. diff --git a/debian/rules b/debian/rules index 02ee734bb..3ebecfba4 100755 --- a/debian/rules +++ b/debian/rules @@ -185,7 +185,7 @@ apt-doc: build-doc # Build architecture-dependent files here. -binary-arch: apt libapt-pkg-dev apt-utils +binary-arch: apt-transport-https apt libapt-pkg-dev apt-utils apt: build debian/shlibs.local dh_testdir -p$@ dh_testroot -p$@ @@ -211,9 +211,14 @@ apt: build debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script cp share/debian-archive.gpg debian/$@/usr/share/$@ - + cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove # head -n 500 ChangeLog > debian/ChangeLog + # make rosetta happy and remove pot files in po/ (but leave stuff + # in po/domains/* untouched) and cp *.po into each domain dir + rm -f build/po/*.pot + rm -f po/*.pot + dh_installexamples -p$@ $(BLD)/docs/examples/* dh_installman -p$@ dh_installcron -p$@ @@ -286,6 +291,32 @@ apt-utils: build debian/shlibs.local dh_md5sums -p$@ dh_builddeb -p$@ +apt-transport-https: build debian/shlibs.local + dh_testdir -p$@ + dh_testroot -p$@ + dh_clean -p$@ -k + dh_installdirs -p$@ + + # install the method + mkdir -p debian/$@/usr/lib/apt/methods + mv $(BLD)/bin/methods/https debian/$@/usr/lib/apt/methods + + dh_installdocs -p$@ + dh_installexamples -p$@ + + # Install the man pages.. + dh_installman -p$@ + + dh_installchangelogs -p$@ + dh_strip -p$@ + dh_compress -p$@ + dh_fixperms -p$@ + dh_installdeb -p$@ + dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib + dh_gencontrol -p$@ + dh_md5sums -p$@ + dh_builddeb -p$@ + source diff: @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false @@ -338,4 +369,4 @@ arch-build: mkdir -p 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 2779f2501..c1e65332d 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -151,7 +151,7 @@ Reverse Provides: a dependency but were not provided by any package. Missing packages may be in evidence if a full distribution is not accessed, or if a package (real or virtual) has been dropped from the distribution. Usually they - are referenced from Conflicts statements.</para> + are referenced from Conflicts or Breaks statements.</para> </listitem> <listitem><para><literal>Total distinct</literal> versions is the number of package versions diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index b98d58737..1bd21a5df 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -42,11 +42,13 @@ <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>purge <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> + <arg>autoremove</arg> </group> </cmdsynopsis> </refsynopsisdiv> @@ -151,6 +153,11 @@ installed instead of removed.</para></listitem> </varlistentry> + <varlistentry><term>purge</term> + <listitem><para><literal>purge</literal> is identical to <literal>remove</literal> except that packages are + removed and purged.</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 @@ -203,6 +210,11 @@ <literal>APT::Clean-Installed</literal> will prevent installed packages from being erased if it is set to off.</para></listitem> </varlistentry> + + <varlistentry><term>autoremove</term> + <listitem><para><literal>autoremove</literal> is used to remove packages that were automatically + installed to satisfy dependencies for some package and that are no more needed.</para></listitem> + </varlistentry> </variablelist> </refsect1> @@ -382,6 +394,13 @@ Configuration Item: <literal>APT::Get::Remove</literal>.</para></listitem> </varlistentry> + <varlistentry><term><option>--auto-remove</option></term> + <listitem><para>If the command is either <literal>install</literal> or <literal>remove</literal>, + then this option acts like running <literal>autoremove</literal> command, removing the unused + dependency packages. Configuration Item: <literal>APT::Get::AutomaticRemove</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> @@ -393,9 +412,9 @@ Item: <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 + <varlistentry><term><option>--diff-only</option></term><term><option>--dsc-only</option></term><term><option>--tar-only</option></term> + <listitem><para>Download only the diff, dsc, or tar file of a source archive. + Configuration Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</literal>, and <literal>APT::Get::Tar-Only</literal>.</para></listitem> </varlistentry> @@ -467,7 +486,7 @@ <refsect1><title>See Also</title> <para>&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, - &apt-conf;, &apt-config;, + &apt-conf;, &apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the APT Howto.</para> </refsect1> @@ -32,7 +32,8 @@ None. .BR apt-cache (8), .BR apt-get (8), .BR apt.conf (5), -.BR sources.list (5) +.BR sources.list (5), +.BR apt-secure (8) .SH DIAGNOSTICS apt returns zero on normal operation, decimal 100 on error. .SH BUGS diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 3e50bef8c..ab0107d36 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -143,10 +143,11 @@ separated by blank lines. Records can have one of two forms, a specific form and a general form. <itemizedlist> <listitem> -<simpara>The specific form assigns a priority (a "Pin-Priority") to a -specified package and specified version or version range. For example, +<simpara>The specific form assigns a priority (a "Pin-Priority") to one or more +specified packages 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> +the <filename>perl</filename> package whose version number begins with "<literal>5.8</literal>". +Multiple packages can be separated by spaces.</simpara> <programlisting> Package: perl @@ -183,7 +184,7 @@ belonging to any distribution whose Archive name is "<literal>unstable</literal> <programlisting> Package: * Pin: release a=unstable -Pin-Priority: 50 +Pin-Priority: 500 </programlisting> <simpara>The following record assigns a high priority to all package versions diff --git a/doc/cache.sgml b/doc/cache.sgml index aa87db986..e257dcd81 100644 --- a/doc/cache.sgml +++ b/doc/cache.sgml @@ -492,7 +492,7 @@ This is the parsed priority value of the package. Dependency contains the information for a single dependency record. The records are split up like this to ease processing by the client. The base of list linked list is Version.DependsList. All forms of dependencies are recorded -here including Conflicts, Suggests and Recommends. +here including Conflicts, Breaks, Suggests and Recommends. <p> Multiple depends on the same package must be grouped together in @@ -671,6 +671,7 @@ of them. #define pkgDEP_Recommends 4 #define pkgDEP_Conflicts 5 #define pkgDEP_Replaces 6 +#define pkgDEP_Breaks 8 </example> </sect1> diff --git a/doc/dpkg-tech.sgml b/doc/dpkg-tech.sgml index 23372d71f..7c6e023dd 100644 --- a/doc/dpkg-tech.sgml +++ b/doc/dpkg-tech.sgml @@ -46,6 +46,8 @@ The basic dpkg package control file supports the following major features:- productivity of the package <item>Conflicts, to specify a package which must NOT be installed in order for the package to be configured + <item>Breaks, to specify a package which is broken by the + package and which should therefore not be configured while broken </list> Each of these dependencies can specify a version and a depedency on that version, for example "<= 0.5-1", "== 2.7.2-1", etc. The comparators available diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 0f0abc30c..d0aad1e3d 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -24,11 +24,16 @@ 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"; + HideAutoRemove "false"; Download-Only "false"; Simulate "false"; Assume-Yes "false"; @@ -90,6 +95,13 @@ APT Cache-Limit "4194304"; Default-Release ""; + // consider Recommends, Suggests as important dependencies that should + // be installed by default + APT::Install-Recommends "false"; + APT::Install-Suggests "false"; + + // consider dependencies of packages in this section manual + Never-MarkAuto-Section "metapackages"; // Write progress messages on this fd (for stuff like base-config) Status-Fd "-1"; @@ -104,6 +116,8 @@ Acquire Queue-Mode "host"; // host|access Retries "0"; Source-Symlinks "true"; + + PDiffs "true"; // try to get the IndexFile diffs // HTTP method configuration http @@ -120,6 +134,18 @@ Acquire Dl-Limit "7"; // 7Kb/sec maximum download rate }; + // HTTPS method configuration: + // - uses the http proxy config + // - uses the http cache-control values + // - uses the http Dl-Limit values + https + { + Verify-Peer "false"; + SslCert "/etc/apt/some.pem"; + CaPath "/etc/ssl/certs"; + Verify-Host" "2"; + }; + ftp { Proxy "ftp://127.0.0.1/"; @@ -237,6 +263,10 @@ DPkg // Control the size of the command line passed to dpkg. MaxBytes 1024; MaxArgs 350; + + // controls if apt will apport on the first dpkg error or if it + // tries to install as many packages as possible + StopOnError "true"; } /* Options you can set to see some debugging text They correspond to names @@ -251,12 +281,13 @@ Debug pkgDPkgPM "false"; pkgDPkgProgressReporting "false"; pkgOrderList "false"; + pkgAutoRemove "false"; // show information about automatic removes BuildDeps "false"; - pkgInitialize "false"; // This one will dump the configuration space NoLocking "false"; Acquire::Ftp "false"; // Show ftp command traffic Acquire::Http "false"; // Show http command traffic + Acquire::Https "false"; // Show https debug Acquire::gpgv "false"; // Show the gpgv traffic aptcdrom "false"; // Show found package files IdentCdrom "false"; diff --git a/doc/fr/apt-get.fr.8.xml b/doc/fr/apt-get.fr.8.xml index cfaa76c7d..dccf415b1 100644 --- a/doc/fr/apt-get.fr.8.xml +++ b/doc/fr/apt-get.fr.8.xml @@ -175,8 +175,8 @@ d'tre supprim. Avec la commande <literal>source</literal>, <command>apt-get</command> rcupre des paquets sources. APT examine les paquets disponibles pour choisir le paquet source rcuprer. Il trouve ensuite et tlcharge dans le rpertoire courant -la version la plus rcente. Les paquets source sont suivis diffremment que -les paquets binaires, via les lignes de type <literal>deb-src</literal> dans le fichier +la version la plus rcente. Les paquets source sont grs indpendamment +des paquets binaires, via les lignes de type <literal>deb-src</literal> dans le fichier &sources-list;. On n'obtiendra probablement pas les mmes sources que celles du paquet install ou celles du paquet qu'on pourrait installer. Si l'option <option>--compile</option> est spcifie, le paquet est compil en un binaire .deb diff --git a/doc/fr/apt_preferences.fr.5.xml b/doc/fr/apt_preferences.fr.5.xml index 6e1d2043e..aba9f0d06 100644 --- a/doc/fr/apt_preferences.fr.5.xml +++ b/doc/fr/apt_preferences.fr.5.xml @@ -208,7 +208,7 @@ d' Archive est <literal>unstable</literal>. <programlisting> Package: * Pin: release a=unstable -Pin-Priority: 500 +Pin-Priority: 50 </programlisting> <simpara>L'entre suivante affecte une priorit haute toutes les versions @@ -578,4 +578,4 @@ apt-get install <replaceable>paquet</replaceable>/unstable &manbugs; &traducteur; -</refentry>
\ No newline at end of file +</refentry> diff --git a/doc/fr/makefile b/doc/fr/makefile index 596de7b09..c650dc03a 100644 --- a/doc/fr/makefile +++ b/doc/fr/makefile @@ -7,7 +7,7 @@ include ../../buildlib/defaults.mak # Do not use XMLTO, build the manpages directly with XSLTPROC XSLTPROC=/usr/bin/xsltproc -STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl +STYLESHEET=./style.fr.xsl # Man pages diff --git a/doc/fr/style.fr.xsl b/doc/fr/style.fr.xsl new file mode 100644 index 000000000..11593bb42 --- /dev/null +++ b/doc/fr/style.fr.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="man.output.encoding" select="'ISO-8859-15'" /> + +</xsl:stylesheet> diff --git a/doc/ja/sources.list.ja.5.xml b/doc/ja/sources.list.ja.5.xml index e000d8767..8522a3be3 100644 --- a/doc/ja/sources.list.ja.5.xml +++ b/doc/ja/sources.list.ja.5.xml @@ -391,7 +391,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/doc/ja/style.ja.xsl b/doc/ja/style.ja.xsl index 4af2d74cf..c102f1366 100644 --- a/doc/ja/style.ja.xsl +++ b/doc/ja/style.ja.xsl @@ -4,6 +4,6 @@ <xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl" /> -<xsl:param name="chunker.output.encoding" select="'EUC-JP'" /> +<xsl:param name="man.output.encoding" select="'EUC-JP'" /> -</xsl:stylesheet>
\ No newline at end of file +</xsl:stylesheet> 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/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index d514ea16e..290326ec3 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -20,6 +20,7 @@ #include <apti18n.h> #include <algorithm> +#include <climits> #include <sys/time.h> #include <regex.h> diff --git a/methods/cdrom.cc b/methods/cdrom.cc index d6b8eae75..601bc11c9 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -30,7 +30,7 @@ class CDROMMethod : public pkgAcqMethod ::Configuration Database; string CurrentID; string CDROM; - bool Mounted; + bool MountedByApt; virtual bool Fetch(FetchItem *Itm); string GetID(string Name); @@ -48,7 +48,7 @@ CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly | SendConfig | NeedsCleanup | Removable), DatabaseLoaded(false), - Mounted(false) + MountedByApt(false) { }; /*}}}*/ @@ -57,7 +57,7 @@ CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly | /* */ void CDROMMethod::Exit() { - if (Mounted == true) + if (MountedByApt == true) UnmountCdrom(CDROM); } /*}}}*/ @@ -139,7 +139,8 @@ bool CDROMMethod::Fetch(FetchItem *Itm) while (CurrentID.empty() == true) { bool Hit = false; - Mounted = MountCdrom(CDROM); + if(!IsMounted(CDROM)) + MountedByApt = MountCdrom(CDROM); for (unsigned int Version = 2; Version != 0; Version--) { if (IdentCdrom(CDROM,NewID,Version) == false) @@ -160,7 +161,8 @@ bool CDROMMethod::Fetch(FetchItem *Itm) break; // I suppose this should prompt somehow? - if (UnmountCdrom(CDROM) == false) + if (_config->FindB("APT::CDROM::NoMount",false) == false && + UnmountCdrom(CDROM) == false) return _error->Error(_("Unable to unmount the CD-ROM in %s, it may still be in use."), CDROM.c_str()); if (MediaFail(Get.Host,CDROM) == false) diff --git a/methods/http.cc b/methods/http.cc index c6623c46f..5aefd4c1f 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -44,6 +44,7 @@ // Internet stuff #include <netdb.h> +#include "config.h" #include "connect.h" #include "rfc2553emu.h" #include "http.h" @@ -58,7 +59,6 @@ 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}; @@ -714,7 +714,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) Req += string("Authorization: Basic ") + Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n"; - Req += "User-Agent: Debian APT-HTTP/1.3\r\n\r\n"; + Req += "User-Agent: Debian APT-HTTP/1.3 ("VERSION")\r\n\r\n"; if (Debug == true) cerr << Req << endl; diff --git a/methods/https.cc b/methods/https.cc new file mode 100644 index 000000000..b758e4ab3 --- /dev/null +++ b/methods/https.cc @@ -0,0 +1,249 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +// $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $ +/* ###################################################################### + + HTTPS Aquire Method - This is the HTTPS aquire method for APT. + + It uses libcurl + + ##################################################################### */ + /*}}}*/ +// Include Files /*{{{*/ +#include <apt-pkg/fileutl.h> +#include <apt-pkg/acquire-method.h> +#include <apt-pkg/error.h> +#include <apt-pkg/hashes.h> + +#include <sys/stat.h> +#include <sys/time.h> +#include <utime.h> +#include <unistd.h> +#include <signal.h> +#include <stdio.h> +#include <errno.h> +#include <string.h> +#include <iostream> +#include <apti18n.h> +#include <sstream> + +#include "config.h" +#include "https.h" + + /*}}}*/ +using namespace std; + +size_t +HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp) +{ + HttpsMethod *me = (HttpsMethod *)userp; + + if(me->File->Write(buffer, size*nmemb) != true) + return false; + + return size*nmemb; +} + +int +HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow, + double ultotal, double ulnow) +{ + HttpsMethod *me = (HttpsMethod *)clientp; + if(dltotal > 0 && me->Res.Size == 0) { + me->Res.Size = dltotal; + me->URIStart(me->Res); + } + return 0; +} + +bool HttpsMethod::SetupProxy() +{ + URI ServerName = Queue->Uri; + + // Determine the proxy setting + if (getenv("http_proxy") == 0) + { + string DefProxy = _config->Find("Acquire::http::Proxy"); + string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host); + if (SpecificProxy.empty() == false) + { + if (SpecificProxy == "DIRECT") + Proxy = ""; + else + Proxy = SpecificProxy; + } + else + Proxy = DefProxy; + } + + // Parse no_proxy, a , separated list of domains + if (getenv("no_proxy") != 0) + { + if (CheckDomainList(ServerName.Host,getenv("no_proxy")) == true) + Proxy = ""; + } + + // Determine what host and port to use based on the proxy settings + int Port = 0; + string Host; + if (Proxy.empty() == true || Proxy.Host.empty() == true) + { + } + else + { + if (Proxy.Port != 0) + curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port); + curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str()); + } +} + + +// HttpsMethod::Fetch - Fetch an item /*{{{*/ +// --------------------------------------------------------------------- +/* This adds an item to the pipeline. We keep the pipeline at a fixed + depth. */ +bool HttpsMethod::Fetch(FetchItem *Itm) +{ + stringstream ss; + struct stat SBuf; + struct curl_slist *headers=NULL; + char curl_errorstr[CURL_ERROR_SIZE]; + + // TODO: + // - http::Timeout + // - http::Pipeline-Depth + // - error checking/reporting + // - more debug options? (CURLOPT_DEBUGFUNCTION?) + + SetupProxy(); + + // callbacks + curl_easy_setopt(curl, CURLOPT_URL, Itm->Uri.c_str()); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, this); + curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, progress_callback); + curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, this); + curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false); + curl_easy_setopt(curl, CURLOPT_FAILONERROR, true); + + // FIXME: https: offer various options of verification + bool peer_verify = _config->FindB("Acquire::https::Verify-Peer", false); + curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, peer_verify); + + // sslcert file + string pem = _config->Find("Acquire::https::SslCert",""); + if(pem != "") + curl_easy_setopt(curl, CURLOPT_SSLCERT, pem.c_str()); + + // CA-Dir + string certdir = _config->Find("Acquire::https::CaPath",""); + if(certdir != "") + curl_easy_setopt(curl, CURLOPT_CAPATH, certdir.c_str()); + + // Server-verify + int verify = _config->FindI("Acquire::https::Verify-Host",2); + curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, verify); + + // cache-control + if(_config->FindB("Acquire::http::No-Cache",false) == false) + { + // cache enabled + if (_config->FindB("Acquire::http::No-Store",false) == true) + headers = curl_slist_append(headers,"Cache-Control: no-store"); + ioprintf(ss, "Cache-Control: max-age=%u", _config->FindI("Acquire::http::Max-Age",0)); + headers = curl_slist_append(headers, ss.str().c_str()); + } else { + // cache disabled by user + headers = curl_slist_append(headers, "Cache-Control: no-cache"); + headers = curl_slist_append(headers, "Pragma: no-cache"); + } + curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); + + // set time values + curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); + curl_easy_setopt(curl, CURLOPT_TIMEVALUE, Itm->LastModified); + + // speed limit + int dlLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024; + if (dlLimit > 0) + curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit); + + // set header + curl_easy_setopt(curl, CURLOPT_USERAGENT,"Debian APT-CURL/1.0 ("VERSION")"); + + // debug + if(_config->FindB("Debug::Acquire::https", false)) + curl_easy_setopt(curl, CURLOPT_VERBOSE, true); + + // error handling + curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr); + + // In this case we send an if-range query with a range header + if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0) + curl_easy_setopt(curl, CURLOPT_RESUME_FROM, (long)SBuf.st_size); + + // go for it - if the file exists, append on it + File = new FileFd(Itm->DestFile, FileFd::WriteAny); + File->Seek(File->Size()); + + // keep apt updated + Res.Filename = Itm->DestFile; + + // get it! + CURLcode success = curl_easy_perform(curl); + + + // cleanup + if(success != 0) { + _error->Error(curl_errorstr); + Fail(); + return true; + } + + if (Res.Size == 0) + Res.Size = File->Size(); + + // check the downloaded result + struct stat Buf; + if (stat(File->Name().c_str(),&Buf) == 0) + { + Res.Size = Buf.st_size; + Res.Filename = File->Name(); + Res.LastModified = Buf.st_mtime; + Res.IMSHit = false; + if (Itm->LastModified != 0 && Buf.st_mtime >= Itm->LastModified) + { + Res.IMSHit = true; + Res.LastModified = Itm->LastModified; + } + } + + // take hashes + Hashes Hash; + FileFd Fd(Res.Filename, FileFd::ReadOnly); + Hash.AddFD(Fd.Fd(), Fd.Size()); + Res.TakeHashes(Hash); + + // keep apt updated + URIDone(Res); + + // cleanup + File->Close(); + Res.Size = 0; + delete File; + curl_slist_free_all(headers); + + return true; +}; + +int main() +{ + setlocale(LC_ALL, ""); + + HttpsMethod Mth; + curl_global_init(CURL_GLOBAL_SSL) ; + + return Mth.Run(); +} + + diff --git a/methods/https.h b/methods/https.h new file mode 100644 index 000000000..6620a10fc --- /dev/null +++ b/methods/https.h @@ -0,0 +1,48 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $ +// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $ +/* ###################################################################### + + HTTP Aquire Method - This is the HTTP aquire method for APT. + + ##################################################################### */ + /*}}}*/ + +#ifndef APT_HTTP_H +#define APT_HTTP_H + +#define MAXLEN 360 + +#include <iostream> +#include <curl/curl.h> + +using std::cout; +using std::endl; + +class HttpsMethod; + + +class HttpsMethod : public pkgAcqMethod +{ + + virtual bool Fetch(FetchItem *); + static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp); + static int progress_callback(void *clientp, double dltotal, double dlnow, + double ultotal, double ulnow); + bool SetupProxy(); + CURL *curl; + FetchResult Res; + + public: + FileFd *File; + + HttpsMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig) + { + File = 0; + curl = curl_easy_init(); + }; +}; + +URI Proxy; + +#endif diff --git a/methods/makefile b/methods/makefile index 1e3b1ef85..f178cbbea 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.4 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method @@ -52,6 +52,13 @@ LIB_MAKES = apt-pkg/makefile SOURCE = http.cc rfc2553emu.cc connect.cc include $(PROGRAM_H) +# The https method +PROGRAM=https +SLIBS = -lapt-pkg -lcurl +LIB_MAKES = apt-pkg/makefile +SOURCE = https.cc +include $(PROGRAM_H) + # The ftp method PROGRAM=ftp SLIBS = -lapt-pkg $(SOCKETLIBS) @@ -59,6 +66,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 index 4377ad29f..930feedc0 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,150 @@ +2007-06-01 Clytie Siddall <clytie@riverland.net.au> + + * vi.po: Updated to 515t. Closes: #426976 + +2007-05-13 Piarres Beobide <pi@beobide.net> + + * eu.po: Updated to 515t. Closes: #423766 + +2007-05-10 Miguel Figueiredo <elmig@debianpt.org> + + * pt.po: 515t. Closes: #423111 + +2007-05-08 Christian Perrier <bubulle@debian.org> + + * fr.po: Updated by Christian Perrier + +2007-05-08 Christian Perrier <bubulle@debian.org> + + * Update all PO and the POT. Gives 513t2f for formerly + complete translations + +2007-04-01 priti Patil <prithisd@gmail.com> + + * mr.po: New Marathi translation + Closes: #416806 + +2007-03-31 Kov Chai <tchaikov@sjtu.org> + + * zh_CN.po: Updated by Kov Chai + Closes: #416822 + +2007-03-29 eric pareja <xenos@upm.edu.ph> + + * tl.po: Updated by Eric Pareja + Closes: #416638 + +2007-02-28 Jacobo Tarrio <jtarrio@trasno.net> + + * gl.po: Updated by Jacobo Tarrio + Closes: #412828 + +2007-02-03 Claus Hindsgaul <claus.hindsgaul@gmail.com> + + * da.po: Updated by Claus Hindsgaul + Closes: #409483 + +2007-01-29 Christian Perrier <bubulle@debian.org> + + * fr.po: Remove a non-breakable space for usability + issues. Closes: #408877 + +2006-12-12 Yuri Kozlov <kozlov.y@gmail.com> + + * ru.po: Updated Russian translation. Closes: #405476 + +2006-12-12 Christian Perrier <bubulle@debian.org> + + * *.po: Unfuzzy after upstream typo corrections + +2006-12-12 Eugeniy Meshcheryakov <eugen@debian.org> + + * uk.po: Updated Ukrainian translation: 495t16f3u + +2006-11-04 Artem Bondarenko <artem.brz@gmail.com> + + * uk.po: New Ukrainian translation: 483t28f3u + +2006-11-02 Emmanuel Galatoulas <galas@tee.gr> + + * el.po: Update to 503t9f2u + +2006-10-24 Michael Piefel <piefel@debian.org> + + * de.po: Updates and corrections. + +2006-10-22 Jordi Mallach <jordi@debian.org> + + * ca.po: Updated to 514t + +2006-10-22 Bart Cornelis <cobaco@linux.be> + + * be.po: Updated to 514t + +2006-10-21 Samuele Giovanni Tonon <samu@debian.org> + + * it.po: Updated to 514t + +2006-10-21 SZERVÁC Attila <sas@321.hu> + + * hu.po: Updated to 514t + +2006-10-21 Asho Yeh <asho@debian.org.tw> + + * zh_TW.po: Updated to 514t + +2006-10-21 Ossama M. Khayat <okhayat@yahoo.com> + + * ar.po: Updated to 293t221u. + +2006-10-16 Yuri Kozlov <kozlov.y@gmail.com> + + * ru.po: Updated to 514t. Closes: #392466 + +2006-10-16 Hans Fredrik Nordhaug <hans@nordhaug.priv.no> + + * nb.po: Updated to 514t. Closes: #392466 + +2006-10-15 Rui Az. <astronomy@mail.pt> + + * pt.po: Updated to 514t. Closes: #393199 + +2006-10-14 Christian Perrier <bubulle@debian.org> + + * fr.po: One spelling error corrected: s/accèder/accéder + +2006-10-13 Khoem Sokhem <khoemsokhem@khmeros.info> + + * km.po: Updated to 514t. + +2006-10-13 Sunjae Park <darehanl@gmail.com> + + * ko.po: Updated to 514t. + +2006-10-12 Yavor Doganov <yavor@doganov.org> + + * bg.po: Updated to 514t. + +2006-10-12 Michael Piefel <piefel@debian.org> + + * de.po: Updated to 514t. + +2006-10-12 Neil Williams <linux@codehelp.co.uk> + + * en_GB.po: Updated to 514t. + +2006-10-08 Javier Fernández-Sanguino Peña <jfs@computer.org> + + * es.po: Updated to 514t. Closes: #391661 + +2006-10-06 Claus Hindsgaul <claus.hindsgaul@gmail.com> + + * da.po: Updated to 514t. Closes: #391424 + +2006-10-04 Miroslav Kure <kurem@upcase.inf.upol.cz> + + * cs.po: Updated. Closes: #391064 + 2006-09-29 Tapio Lehtonen <tale@debian.org> * fi.po: Updated to 514t. Closes: #390149 diff --git a/po/apt-all.pot b/po/apt-all.pot index 4c354136a..a7185fcf3 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-10-02 15:46+0200\n" +"POT-Creation-Date: 2007-06-08 23:11+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:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr "" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr "" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total Distinct Descriptions: " +msgstr "" + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "" + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr "" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr "" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:551 +#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -243,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:819 #, c-format msgid "Unable to write to %s" msgstr "" @@ -252,31 +260,31 @@ msgstr "" msgid "Cannot get debconf version. Is debconf installed?" msgstr "" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:168 ftparchive/apt-ftparchive.cc:342 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 +#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:184 +#: ftparchive/apt-ftparchive.cc:207 ftparchive/apt-ftparchive.cc:257 +#: ftparchive/apt-ftparchive.cc:271 ftparchive/apt-ftparchive.cc:293 #, c-format msgid "Error processing directory %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:255 msgid "Source extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:372 msgid "Error writing header to contents file" msgstr "" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:402 #, c-format msgid "Error processing contents %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:557 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -318,11 +326,11 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:763 msgid "No selections matched" msgstr "" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:836 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "" @@ -542,221 +550,221 @@ msgstr "" msgid "Failed to rename %s to %s" msgstr "" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1659 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr "" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2321 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2175 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -764,74 +772,74 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2218 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2227 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -839,79 +847,117 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +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:1475 cmdline/apt-get.cc:1740 +msgid "The following information may help to resolve the situation:" +msgstr "" + +#: cmdline/apt-get.cc:1479 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, c-format +msgid "Couldn't find task %s" +msgstr "" + +#: cmdline/apt-get.cc:1646 cmdline/apt-get.cc:1682 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1669 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1699 +#, c-format +msgid "%s set to manual installed.\n" +msgstr "" + +#: cmdline/apt-get.cc:1712 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1715 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1727 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -919,163 +965,159 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1735 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1743 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1774 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1863 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1864 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1892 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1900 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2075 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2339 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2178 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2183 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2186 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2192 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2223 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2251 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2263 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2264 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2300 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2316 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2344 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2364 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2416 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2468 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2528 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2542 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2546 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2578 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2619 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1090,6 +1132,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge 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" @@ -1360,9 +1403,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:752 +#: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826 +#: apt-pkg/pkgcachegen.cc:949 msgid "Reading package lists" msgstr "" @@ -1477,25 +1520,26 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "" @@ -1555,7 +1599,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:472 methods/rsh.cc:190 msgid "Read error" msgstr "" @@ -1567,7 +1611,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:511 methods/rsh.cc:232 msgid "Write error" msgstr "" @@ -1834,7 +1878,7 @@ msgstr "" msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:982 #, c-format msgid "Selection %s not found" msgstr "" @@ -1894,12 +1938,12 @@ msgstr "" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "" @@ -1964,154 +2008,172 @@ msgstr "" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:83 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:88 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:106 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:110 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:378 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:391 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:437 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:493 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:523 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:598 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:604 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:615 msgid "Problem syncing the file" msgstr "" -#: apt-pkg/pkgcache.cc:121 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:127 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:213 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "" -#: apt-pkg/pkgcache.cc:213 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "" -#: apt-pkg/pkgcache.cc:213 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "" -#: apt-pkg/pkgcache.cc:214 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "" -#: apt-pkg/pkgcache.cc:214 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "" -#: apt-pkg/pkgcache.cc:214 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "" -#: apt-pkg/pkgcache.cc:215 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "" #: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "" -#: apt-pkg/pkgcache.cc:227 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "" -#: apt-pkg/pkgcache.cc:227 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:58 apt-pkg/depcache.cc:87 +#: apt-pkg/depcache.cc:98 apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:59 +#: apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:88 +#: apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "" +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 +msgid "Reading state information" +msgstr "" + +#: apt-pkg/depcache.cc:196 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "" + +#: apt-pkg/depcache.cc:202 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "" + #: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" @@ -2152,7 +2214,7 @@ msgstr "" msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:451 #, c-format msgid "Line %u too long in source list %s." msgstr "" @@ -2172,7 +2234,7 @@ msgstr "" msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:403 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2185,19 +2247,19 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:254 #, 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:1110 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1112 msgid "Unable to correct problems, you have held broken packages." msgstr "" @@ -2213,12 +2275,12 @@ msgstr "" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:832 #, c-format msgid "Retrieving file %li of %li" msgstr "" @@ -2233,17 +2295,17 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:384 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2264,132 +2326,147 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 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:682 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:767 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 +#: apt-pkg/acquire-item.cc:1411 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:1106 +msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:1219 #, 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:812 +#: apt-pkg/acquire-item.cc:1278 #, 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:848 +#: apt-pkg/acquire-item.cc:1314 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:1401 msgid "Size mismatch" msgstr "" @@ -2398,92 +2475,99 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:532 #, 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:541 apt-pkg/cdrom.cc:623 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:566 #, c-format msgid "Stored label: %s \n" msgstr "" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:586 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:604 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:608 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:616 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:634 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:674 +#, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" +msgstr "" + +#: apt-pkg/cdrom.cc:711 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:740 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:756 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:760 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:786 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:795 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:837 +msgid "Unmounting CD-ROM...\n" 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 "" @@ -2538,6 +2622,10 @@ msgstr "" msgid "Completely removed %s" msgstr "" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "" @@ -1,71 +1,74 @@ -# Kurdish translation for apt -# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006 -# This file is distributed under the same license as the apt package. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2006. +# translation of apt_po.po to Arabic +# This file is put in the public domain. # +# Ossama M. Khayat <okhayat@yahoo.com>, 2005, 2006. msgid "" msgstr "" -"Project-Id-Version: apt\n" +"Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 16:17+0200\n" -"PO-Revision-Date: 2006-09-16 17:51+0100\n" -"Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n" -"Language-Team: Kurdish <ku@li.org>\n" +"POT-Creation-Date: 2006-10-11 20:34+0200\n" +"PO-Revision-Date: 2006-10-20 21:28+0300\n" +"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n" +"Language-Team: Arabic <support@arabeyes.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Arabic\n" +"X-Poedit-Country: Lebanon\n" +"X-Poedit-SourceCharset: utf-8\n" +"X-Generator: KBabel 1.11.4\n" #: cmdline/apt-cache.cc:135 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "" +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 "Pakêt nehate dîtin %s" +msgstr "تعذر العثور على الحزمة %s" #: cmdline/apt-cache.cc:232 msgid "Total package names : " -msgstr "Navên paketan bi giştî :" +msgstr "أسماء الحزم الكلية :" #: cmdline/apt-cache.cc:272 msgid " Normal packages: " -msgstr " Pakêtên normal:" +msgstr " الحزم العادية:" #: cmdline/apt-cache.cc:273 msgid " Pure virtual packages: " -msgstr " Pakêtên farazî yên safî:" +msgstr "الحزمة الوهمية تماماً:" #: cmdline/apt-cache.cc:274 msgid " Single virtual packages: " -msgstr " Pakêta tenê ya farazî:" +msgstr " الحزمة الوهمية المفردة:" #: cmdline/apt-cache.cc:275 msgid " Mixed virtual packages: " -msgstr " Pakêtên hevbeş yên farazî:" +msgstr " الحزم الوهمية المختلطة:" #: cmdline/apt-cache.cc:276 msgid " Missing: " -msgstr " Winda: " +msgstr " مفقودة:" #: cmdline/apt-cache.cc:278 msgid "Total distinct versions: " -msgstr "Guhertoyên vekirî yên giştî:" +msgstr "مجموع النسخ الفريدة:" #: cmdline/apt-cache.cc:280 msgid "Total dependencies: " -msgstr "Bindestên giştî:" +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: " @@ -77,28 +80,28 @@ msgstr "" #: cmdline/apt-cache.cc:316 msgid "Total slack space: " -msgstr "Cihê giştî yê sist:" +msgstr "" #: cmdline/apt-cache.cc:324 msgid "Total space accounted for: " -msgstr "Cihê giştî yê veqetandî: " +msgstr "مجموع المساحة المحسوب حسابها:" #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 #, c-format msgid "Package file %s is out of sync." -msgstr "Pakêta dosya %s li derveyî demê ye." +msgstr "" #: cmdline/apt-cache.cc:1231 msgid "You must give exactly one pattern" -msgstr "Pêwist e tu mînakekê bidî" +msgstr "يجب أن تعطي صيغة واحدة بالضبط" #: cmdline/apt-cache.cc:1385 msgid "No packages found" -msgstr "Pakêt nayên dîtin" +msgstr "لم يُعثر على أية حزم" #: cmdline/apt-cache.cc:1462 msgid "Package files:" -msgstr "Pelgehên Pakêt:" +msgstr "ملفات الحزم:" #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" @@ -112,34 +115,34 @@ msgstr "%4i %s\n" #. Show any packages have explicit pins #: cmdline/apt-cache.cc:1482 msgid "Pinned packages:" -msgstr "" +msgstr "الحزم المُدبّسة:" #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 msgid "(not found)" -msgstr "(nehate dîtin)" +msgstr "(غير موجود)" #. Installed version #: cmdline/apt-cache.cc:1515 msgid " Installed: " -msgstr " Sazkirî: " +msgstr " مُثبّت:" #: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 msgid "(none)" -msgstr "(ne tiştek)" +msgstr "(لاشيء)" #. Candidate Version #: cmdline/apt-cache.cc:1522 msgid " Candidate: " -msgstr " Berendam: " +msgstr " مرشّح: " #: cmdline/apt-cache.cc:1532 msgid " Package pin: " -msgstr " Destika pakêtê:" +msgstr "" #. Show the priority tables #: cmdline/apt-cache.cc:1541 msgid " Version table:" -msgstr " Tabloya guhertoyan:" +msgstr " جدول النسخ:" #: cmdline/apt-cache.cc:1556 #, c-format @@ -148,10 +151,10 @@ 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:2380 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" -msgstr "%s %s ji bo %s %s komkirî di %s %s de\n" +msgstr "%s %s لـ%s %s مُجمّع على %s %s\n" #: cmdline/apt-cache.cc:1659 msgid "" @@ -194,15 +197,15 @@ msgstr "" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Ji kerema xwe re navekî li vî Dîsketî bike, wekî '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 "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne" +msgstr "الرجاء إدخال قرص في السواقة وضغط الزر enter" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "" +msgstr "كرر هذه العملية لباقي الأقراص المدمجة في المجموعة." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" @@ -223,23 +226,11 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Bikaranîn: apt-config [vebijark] ferman\n" -"apt-config, amûra xwendina dosyeya mîhengên APTê ye\n" -"\n" -"Ferman\n" -" shell - moda shell\n" -" dump - Mîhengan nîşan dide\n" -"\n" -"Vebijark:\n" -" -h Ev dosyeya alîkariyê ye.\n" -" -c=? Dosyeya mîhengan nîşan dide\n" -" -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar bike. " -"mînak -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format msgid "%s not a valid DEB package." -msgstr "%s ne paketeke DEB ya derbasdar e." +msgstr "%s ليس حزمة DEB صالحة." #: cmdline/apt-extracttemplates.cc:232 msgid "" @@ -258,35 +249,35 @@ msgstr "" #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 #, c-format msgid "Unable to write to %s" -msgstr "Nivîsandin ji bo %s ne pêkane" +msgstr "تعذرت الكتابة إلى %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Guhertoya debconf nehate stendin. debconf sazkirî ye?" +msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟" #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" -msgstr "Lîsteya dirêjahiya pakêtê zêde dirêj e" +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 "Di şixulandina pêrista %s de çewtî" +msgstr "خطأ في معالجة الدليل %s" #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" -msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" +msgstr "قائمة توسيعات المصدر طويلة جداً" #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" -msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" +msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات" #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" -msgstr "Dema şixulandina naveroka %s çewtî" +msgstr "خطأ في معالجة المحتويات %s" #: ftparchive/apt-ftparchive.cc:556 msgid "" @@ -332,22 +323,22 @@ msgstr "" #: 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 "Di koma pelgehên pakêta '%s' de hin pelgeh kêm in" +msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'" #: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB xerabe ye, navê dosyeyê weke %s.old hate guherandin" +msgstr "قاعدة البيانات كانت فاسدة، فتم تغيير اسمها إلى %s.old" #: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide" +msgstr "قاعدة البيانات قديمة، محاولة ترقية %s" #: ftparchive/cachedb.cc:76 msgid "" @@ -358,7 +349,7 @@ msgstr "" #: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "Danegira %s nehate vekirin: %s" +msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" #: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 @@ -368,7 +359,7 @@ msgstr "" #: ftparchive/cachedb.cc:242 msgid "Archive has no control record" -msgstr "Tomara kontrola arşîvê tuneye" +msgstr "" #: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" @@ -377,7 +368,7 @@ msgstr "" #: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" -msgstr "W: pelrêça %s nayê xwendin\n" +msgstr "W: تعذرت قراءة الدليل %s\n" #: ftparchive/writer.cc:84 #, c-format @@ -399,7 +390,7 @@ msgstr "" #: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" -msgstr "%s ji hev nehate veçirandin" +msgstr "" #: ftparchive/writer.cc:173 msgid "Tree walking failed" @@ -408,12 +399,12 @@ msgstr "" #: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" -msgstr "%s venebû" +msgstr "فشل فتح %s" #: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" -msgstr "" +msgstr " DeLink %s [%s]\n" #: ftparchive/writer.cc:265 #, c-format @@ -428,7 +419,7 @@ msgstr "" #: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" -msgstr "" +msgstr "*** فشل ربط %s بـ%s" #: ftparchive/writer.cc:286 #, c-format @@ -437,7 +428,7 @@ msgstr "" #: ftparchive/writer.cc:390 msgid "Archive had no package field" -msgstr "Di arşîvê de qada pakêtê tuneye" +msgstr "" #: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format @@ -462,16 +453,16 @@ msgstr "" #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" -msgstr "" +msgstr "خطأ داخلي، تعذر العثور على العضو %s" #: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" -msgstr "" +msgstr "realloc - فشل تعيين الذاكرة" #: ftparchive/override.cc:38 ftparchive/override.cc:146 #, c-format msgid "Unable to open %s" -msgstr "%s venebû" +msgstr "تعذر فتح %s" #: ftparchive/override.cc:64 ftparchive/override.cc:170 #, c-format @@ -522,7 +513,7 @@ msgstr "" #: ftparchive/multicompress.cc:238 #, c-format msgid "Internal error, failed to create %s" -msgstr "" +msgstr "خطأ داخلي، تعذر إنشاء %s" #: ftparchive/multicompress.cc:289 msgid "Failed to create subprocess IPC" @@ -552,11 +543,11 @@ msgstr "" #: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" -msgstr "" +msgstr "فشل تغيير اسم %s إلى %s" #: cmdline/apt-get.cc:120 msgid "Y" -msgstr "E" +msgstr "Y" #: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format @@ -570,195 +561,197 @@ msgstr "" #: cmdline/apt-get.cc:327 #, c-format msgid "but %s is installed" -msgstr "lê %s sazkirî ye" +msgstr "إلا أن %s مثبت" #: cmdline/apt-get.cc:329 #, c-format msgid "but %s is to be installed" -msgstr "lê %s dê were sazkirin" +msgstr "إلا أنه سيتم تثبيت %s" #: cmdline/apt-get.cc:336 msgid "but it is not installable" -msgstr "lê sazkirina wê ne gengaz e" +msgstr "إلا أنه غير قابل للتثبيت" #: cmdline/apt-get.cc:338 msgid "but it is a virtual package" -msgstr "lê paketeke farazî ye" +msgstr "إلا أنها حزمة وهمية" #: cmdline/apt-get.cc:341 msgid "but it is not installed" -msgstr "lê ne sazkirî ye" +msgstr "إلا أنها غير مثبتة" #: cmdline/apt-get.cc:341 msgid "but it is not going to be installed" -msgstr "lê dê neyê sazkirin" +msgstr "إلا أنه لن يتم تثبيتها" #: cmdline/apt-get.cc:346 msgid " or" -msgstr " û" +msgstr " أو" #: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" -msgstr "Ev pakêtên NÛ dê werine sazkirin:" +msgstr "سيتم تثبيت الحزم الجديدة التالية:" #: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" -msgstr "Ev pakêt dê werine RAKIRIN:" +msgstr "سيتم إزالة الحزم التالية:" #: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" -msgstr "" +msgstr "سيتم الإبقاء على الحزم التالية:" #: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" -msgstr "Ev paket dê werine bilindkirin:" +msgstr "ستتم ترقية الحزم التالية:" #: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" -msgstr "" +msgstr "سيتم تثبيط الحزم التالية:" #: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" -msgstr "" +msgstr "سيتم تغيير الحزم المبقاة التالية:" #: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " -msgstr "%s (ji ber %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 "" +msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، " #: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " -msgstr "%lu ji nû ve sazkirî" +msgstr "%lu أعيد تثبيتها، " #: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " -msgstr "" +msgstr "%lu مثبطة، " #: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "" +msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n" #: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "" +msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" #: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." -msgstr "Bindestî tên serrastkirin..." +msgstr "تصحيح المعتمدات..." #: cmdline/apt-get.cc:652 msgid " failed." -msgstr " neserketî." +msgstr " فشل." #: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" -msgstr "" +msgstr "لم يمكن تصحيح المعتمدات" #: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" -msgstr "" +msgstr "لم يمكن تقليص مجموعة الترقية" #: cmdline/apt-get.cc:660 msgid " Done" -msgstr " Temam" +msgstr " تم" #: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." -msgstr "" +msgstr "قد ترغب بتنفيذ الأمر `apt-get -f install' لتصحيح هذه." #: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." -msgstr "" +msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f." #: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "" +msgstr "تحذير: تعذرت المصادقة على الحزم التالية!" #: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "تم غض النظر عن تحذير المصادقة.\n" #: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " -msgstr "" +msgstr "تثبيت هذه الحزم دون التحقق منها [y/N]؟ " #: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" -msgstr "" +msgstr "تعذرت المصادقة على بعض الحزم" #: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" -msgstr "" +msgstr "هناك مشاكل وتم استخدام -y دون --force-yes" #: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!" #: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." -msgstr "" +msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة." #: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" -msgstr "" +msgstr "خطأ داخلي، لم تنته عملية الترتيب" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" -msgstr "Pelrêça daxistinê nayê quflekirin" +msgstr "تعذر قَفْل دليل التنزيل" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2128 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." -msgstr "" +msgstr "تعذرت قراءة قائمة المصادر." #: 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:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "" +msgstr "بحاجة إلى جلب %sب/%sب من الأرشيف.\n" #: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "" +msgstr "بحاجة إلى جلب %sب من الأرشيف.\n" #: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "" +msgstr "بعد الاستخراج %sب من المساحة الإضافيّة سيتمّ استخدامها.\n" #: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" -msgstr "" +msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" -msgstr "" +msgstr "تعذر حساب المساحة الحرة في %s" #: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." -msgstr "" +msgstr "ليس هناك مساحة كافية في %s." #: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." @@ -766,7 +759,7 @@ msgstr "" #: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" -msgstr "" +msgstr "نعم، افعل ما أقوله!" #: cmdline/apt-get.cc:868 #, c-format @@ -775,73 +768,78 @@ msgid "" "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 "" +msgstr "إجهاض." #: cmdline/apt-get.cc:889 msgid "Do you want to continue [Y/n]? " -msgstr "" +msgstr "هل تريد الاستمرار [Y/n]؟" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2025 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" -msgstr "" +msgstr "فشل إحضار %s %s\n" #: cmdline/apt-get.cc:979 msgid "Some files failed to download" -msgstr "" +msgstr "فشل تنزيل بعض الملفات" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" -msgstr "" +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 "" +msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً" #: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." -msgstr "" +msgstr "تعذر تصحيح الحزم المفقودة." #: cmdline/apt-get.cc:996 msgid "Aborting install." -msgstr "" +msgstr "إجهاض التثبيت." #: cmdline/apt-get.cc:1030 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "" +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 "" +msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n" #: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "" +msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n" #: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" -msgstr "" +msgstr "الحزمة %s وهميّة وتوفّرها:\n" #: cmdline/apt-get.cc:1081 msgid " [Installed]" -msgstr " [Sazkirî]" +msgstr " [مُثبّتة]" #: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." -msgstr "" +msgstr "يجب اختيار واحدة بالتحديد لتثبيتها." #: cmdline/apt-get.cc:1091 #, c-format @@ -853,45 +851,45 @@ msgstr "" #: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" -msgstr "" +msgstr "على أيّ فإن الحزم التالية تحلّ مكانها:" #: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" -msgstr "" +msgstr "الحزمة %s ليس لها مرشح تثبيت" #: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "" +msgstr "إعادة تثبيت %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n" #: cmdline/apt-get.cc:1141 #, c-format msgid "%s is already the newest version.\n" -msgstr "" +msgstr "%s هي النسخة الأحدث.\n" #: cmdline/apt-get.cc:1168 #, c-format msgid "Release '%s' for '%s' was not found" -msgstr "" +msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'" #: cmdline/apt-get.cc:1170 #, c-format msgid "Version '%s' for '%s' was not found" -msgstr "" +msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'" #: cmdline/apt-get.cc:1176 #, c-format msgid "Selected version %s (%s) for %s\n" -msgstr "" +msgstr "النسخة المحددة %s (%s) للإصدارة %s\n" #: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" -msgstr "" +msgstr "لا يقبل الأمر update أية مُعطيات" #: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" -msgstr "" +msgstr "تعذر قفل دليل القائمة" #: cmdline/apt-get.cc:1384 msgid "" @@ -901,27 +899,28 @@ msgstr "" #: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" -msgstr "" +msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" #: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" -msgstr "" +msgstr "تعذر العثور على الحزمة %s" #: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "" +msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n" #: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "" +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 "" @@ -940,154 +939,154 @@ msgstr "" #: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" -msgstr "" +msgstr "قد تساعد المعلومات التالية في حل المشكلة:" #: cmdline/apt-get.cc:1577 msgid "Broken packages" -msgstr "Paketên şikestî" +msgstr "حزم معطوبة" #: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" -msgstr "" +msgstr "سيتم تثبيت الحزم الإضافيّة التالية:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" -msgstr "Paketên tên pêşniyaz kirin:" +msgstr "الحزم المقترحة:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" -msgstr "Paketên tên tawsiyê kirin:" +msgstr "الحزم المستحسنة:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " -msgstr "" +msgstr "حساب الترقية..." -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" -msgstr "Serneket" +msgstr "فشل" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1721 msgid "Done" -msgstr "Temam" +msgstr "تمّ" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" -msgstr "" +msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها" -#: cmdline/apt-get.cc:1917 cmdline/apt-get.cc:2146 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" -msgstr "" +msgstr "تعذر العثور على مصدر الحزمة %s" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "" +msgstr "تخطي الملف '%s' المنزل مسبقاً\n" -#: cmdline/apt-get.cc:1985 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" -msgstr "" +msgstr "ليس هناك مساحة كافية في %s" -#: cmdline/apt-get.cc:1990 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "" +msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n" -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "" +msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n" -#: cmdline/apt-get.cc:1999 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" -msgstr "" +msgstr "إحضار المصدر %s\n" -#: cmdline/apt-get.cc:2030 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." -msgstr "" +msgstr "فشل إحضار بعض الأرشيفات." -#: cmdline/apt-get.cc:2058 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2070 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "" +msgstr "أمر فك الحزمة '%s' فشل.\n" -#: cmdline/apt-get.cc:2071 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2088 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" -msgstr "" +msgstr "أمر البناء '%s' فشل.\n" -#: cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2123 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2151 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2171 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2223 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2275 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2310 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2353 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" -msgstr "" +msgstr "الوحدات المدعومة:" -#: cmdline/apt-get.cc:2426 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1135,25 +1134,25 @@ 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 "" +msgstr "جلب %sب في %s (%sب/ث)\n" #: cmdline/acqprogress.cc:225 #, c-format msgid " [Working]" -msgstr " [Dixebite]" +msgstr " [يعمل]" #: cmdline/acqprogress.cc:271 #, c-format @@ -1162,10 +1161,13 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" +"تغيير الوسط: الرجاء إدخال القرص المُسمّى\n" +" '%s'\n" +"في السوّاقة '%s' وضغط مفتاح الإدخال\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" -msgstr "" +msgstr "سجل حزمة مجهول!" #: cmdline/apt-sortpkgs.cc:150 msgid "" @@ -1183,51 +1185,49 @@ msgstr "" #: 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 "" +msgstr "اضغط مفتاح الإدخال للاستمرار." #: 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 "" +msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها وتشغيل التثبيت مجدداً" #: dselect/update:30 msgid "Merging available information" -msgstr "" +msgstr "دمج المعلومات المتوفرة" #: apt-inst/contrib/extracttar.cc:117 -#, fuzzy msgid "Failed to create pipes" -msgstr "%s ji hev nehate veçirandin" +msgstr "" #: apt-inst/contrib/extracttar.cc:144 -#, fuzzy msgid "Failed to exec gzip " -msgstr "%s ji hev nehate veçirandin" +msgstr "فشل تنفيذ gzip" #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" -msgstr "" +msgstr "أرشيف فاسد" #: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" -msgstr "" +msgstr "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد" #: apt-inst/contrib/extracttar.cc:299 #, c-format @@ -1236,7 +1236,7 @@ msgstr "" #: apt-inst/contrib/arfile.cc:73 msgid "Invalid archive signature" -msgstr "" +msgstr "توقيع الأرشيف غير صالح" #: apt-inst/contrib/arfile.cc:81 msgid "Error reading archive member header" @@ -1247,13 +1247,12 @@ msgid "Invalid archive member header" msgstr "" #: apt-inst/contrib/arfile.cc:131 -#, fuzzy msgid "Archive is too short" -msgstr "Tomara kontrola arşîvê tuneye" +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" @@ -1264,13 +1263,12 @@ msgid "Failed to locate the hash element!" msgstr "" #: apt-inst/filelist.cc:463 -#, fuzzy msgid "Failed to allocate diversion" -msgstr "%s venebû" +msgstr "" #: apt-inst/filelist.cc:468 msgid "Internal error in AddDiversion" -msgstr "" +msgstr "خطأ داخلي في AddDiversion" #: apt-inst/filelist.cc:481 #, c-format @@ -1285,27 +1283,27 @@ msgstr "" #: apt-inst/filelist.cc:553 #, c-format msgid "Duplicate conf file %s/%s" -msgstr "" +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 ji hev nehate veçirandin" +msgstr "فشلت كتابة الملف %s" #: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 -#, fuzzy, c-format +#, c-format msgid "Failed to close file %s" -msgstr "%s venebû" +msgstr "فشل إغلاق الملف %s" #: apt-inst/extract.cc:96 apt-inst/extract.cc:167 -#, fuzzy, c-format +#, c-format msgid "The path %s is too long" -msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" +msgstr "المسار %s طويل جداً" #: apt-inst/extract.cc:127 #, c-format msgid "Unpacking %s more than once" -msgstr "" +msgstr "فكّ تحزيم %s أكثر من مرّة" #: apt-inst/extract.cc:137 #, c-format @@ -1318,9 +1316,8 @@ msgid "The package is trying to write to the diversion target %s/%s" msgstr "" #: apt-inst/extract.cc:157 apt-inst/extract.cc:300 -#, fuzzy msgid "The diversion path is too long" -msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" +msgstr "" #: apt-inst/extract.cc:243 #, c-format @@ -1333,7 +1330,7 @@ msgstr "" #: apt-inst/extract.cc:287 msgid "The path is too long" -msgstr "" +msgstr "المسار طويل جداً" #: apt-inst/extract.cc:417 #, c-format @@ -1348,29 +1345,29 @@ msgstr "" #: 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 -#, fuzzy, c-format +#, c-format msgid "Unable to read %s" -msgstr "%s venebû" +msgstr "تعذرت قراءة %s" #: apt-inst/extract.cc:494 -#, fuzzy, c-format +#, c-format msgid "Unable to stat %s" -msgstr "Nivîsandin ji bo %s ne pêkane" +msgstr "" #: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 -#, fuzzy, c-format +#, c-format msgid "Failed to remove %s" -msgstr "%s ji hev nehate veçirandin" +msgstr "تعذرت إزالة %s" #: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 -#, fuzzy, c-format +#, c-format msgid "Unable to create %s" -msgstr "Nivîsandin ji bo %s ne pêkane" +msgstr "تعذر إنشاء %s" #: apt-inst/deb/dpkgdb.cc:118 -#, fuzzy, c-format +#, c-format msgid "Failed to stat %sinfo" -msgstr "%s venebû" +msgstr "" #: apt-inst/deb/dpkgdb.cc:123 msgid "The info and temp directories need to be on the same filesystem" @@ -1380,23 +1377,22 @@ msgstr "" #: 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 "Paketên şikestî" +msgstr "قراءة قوائم الحزم" #: apt-inst/deb/dpkgdb.cc:180 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "" +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:386 msgid "Reading file listing" -msgstr "" +msgstr "قراءة سرد الملفات" #: apt-inst/deb/dpkgdb.cc:216 #, c-format @@ -1409,11 +1405,11 @@ 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 "فشلت قراءة ملف القائمة %sinfo/%s" #: apt-inst/deb/dpkgdb.cc:266 msgid "Internal error getting a node" -msgstr "" +msgstr "خطأ داخلي أثناء الحصول على node" #: apt-inst/deb/dpkgdb.cc:309 #, c-format @@ -1466,59 +1462,58 @@ msgstr "" #: apt-inst/deb/debfile.cc:112 #, c-format msgid "Couldn't change to %s" -msgstr "" +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 "" #: methods/cdrom.cc:114 -#, fuzzy, c-format +#, c-format msgid "Unable to read the cdrom database %s" -msgstr "Pakêt nehate dîtin %s" +msgstr "تعذرت قراءة قاعدة بيانات القرص المدمج %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 "" +"الرجاء استخدام apt-cdrom لتعريف APT بهذا القرص المدمج. لا يمكن استخدام apt-" +"get update لإضافة أقراص مدمجة جديدة." #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" -msgstr "" +msgstr "القرص المدمج الخطأ" #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "" +msgstr "تعذر فكّ القرص المدمج من %s، إذ قد يكون لا يزال قيد الاستخدام." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "(nehate dîtin)" +msgstr "لم يُعثر على القرص." #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 -#, fuzzy msgid "File not found" -msgstr "(nehate dîtin)" +msgstr "لم يُعثر على الملف" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 -#, fuzzy +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" -msgstr "%s venebû" +msgstr "فشيل تنفيذ stat" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" -msgstr "" +msgstr "فشل تعيين وقت التعديل" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" @@ -1527,59 +1522,60 @@ msgstr "" #. 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 "" #: methods/ftp.cc:173 -#, fuzzy msgid "Unable to determine the local name" -msgstr "Nivîsandin ji bo %s ne pêkane" +msgstr "" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" -msgstr "" +msgstr "رفض الخادم اتصالنا بالرد: %s" #: methods/ftp.cc:210 #, c-format msgid "USER failed, server said: %s" -msgstr "" +msgstr "فشل USER، ردّ الخادم: %s" #: methods/ftp.cc:217 #, c-format msgid "PASS failed, server said: %s" -msgstr "" +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 "" +msgstr "فشل أمر نص تسجيل الدخول البرمجي '%s'، ردّ الخادم: %s" #: methods/ftp.cc:291 #, c-format msgid "TYPE failed, server said: %s" -msgstr "" +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." @@ -1591,7 +1587,7 @@ 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" @@ -1623,7 +1619,7 @@ msgstr "" #: methods/ftp.cc:779 msgid "Unable to send PORT command" -msgstr "" +msgstr "تعذر إرسال الأمر PORT" #: methods/ftp.cc:789 #, c-format @@ -1633,7 +1629,7 @@ msgstr "" #: methods/ftp.cc:798 #, c-format msgid "EPRT failed, server said: %s" -msgstr "" +msgstr "فشل EPRT، ردّ الخادم: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" @@ -1641,16 +1637,16 @@ msgstr "" #: methods/ftp.cc:825 msgid "Unable to accept connection" -msgstr "" +msgstr "تعذر قبول الاتصال" #: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" #: methods/ftp.cc:877 -#, fuzzy, c-format +#, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Danegira %s nehate vekirin: %s" +msgstr "تعذر إحضار الملف، ردّ الخادم '%s'" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" @@ -1659,27 +1655,26 @@ msgstr "" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "" +msgstr "فشل نقل البيانات، ردّ الخادم '%s'" #. Get the files information #: methods/ftp.cc:997 msgid "Query" -msgstr "" +msgstr "استعلام" #: methods/ftp.cc:1109 -#, fuzzy msgid "Unable to invoke " -msgstr "%s venebû" +msgstr "" #: methods/connect.cc:64 #, c-format msgid "Connecting to %s (%s)" -msgstr "" +msgstr "الاتصال بـ%s (%s)" #: methods/connect.cc:71 #, c-format msgid "[IP: %s %s]" -msgstr "" +msgstr "[IP: %s %s]" #: methods/connect.cc:80 #, c-format @@ -1689,29 +1684,29 @@ msgstr "" #: methods/connect.cc:86 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "" +msgstr "تعذر تمهيد الاتصال بـ%s:%s (%s)." #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "" +msgstr "تعذر الاتصال بـ%s:%s (%s)، انتهى وقت الاتصال" #: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." -msgstr "" +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 "" +msgstr "الاتصال بـ%s" #: methods/connect.cc:167 -#, fuzzy, c-format +#, c-format msgid "Could not resolve '%s'" -msgstr "%s ji hev nehate veçirandin" +msgstr "" #: methods/connect.cc:173 #, c-format @@ -1724,9 +1719,9 @@ msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" #: methods/connect.cc:223 -#, fuzzy, c-format +#, c-format msgid "Unable to connect to %s %s:" -msgstr "Nivîsandin ji bo %s ne pêkane" +msgstr "تعذر الاتصال بـ%s %s:" #: methods/gpgv.cc:65 #, c-format @@ -1756,9 +1751,8 @@ msgid "Unknown error executing gpgv" msgstr "" #: methods/gpgv.cc:249 -#, fuzzy msgid "The following signatures were invalid:\n" -msgstr "Ev pakêtên NÛ dê werine sazkirin:" +msgstr "" #: methods/gpgv.cc:256 msgid "" @@ -1766,19 +1760,19 @@ msgid "" "available:\n" msgstr "" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "" #: methods/http.cc:376 msgid "Waiting for headers" -msgstr "" +msgstr "بانتظار الترويسات" #: methods/http.cc:522 #, c-format @@ -1787,71 +1781,67 @@ msgstr "" #: methods/http.cc:530 msgid "Bad header line" -msgstr "" +msgstr "سطر ترويسة سيء" #: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" -msgstr "" +msgstr "أرسل خادم http ترويسة ردّ غير صالحة" #: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "" +msgstr "أرسل خادم http ترويسة طول محتويات (ِContent-Length) غير صالحة" #: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "" +msgstr "أرسل خادم http ترويسة مدى محتويات (ِContent-Range) غير صالحة" #: methods/http.cc:602 msgid "This HTTP server has broken range support" -msgstr "" +msgstr "خادم http له دعم مدى معطوب" #: methods/http.cc:626 msgid "Unknown date format" -msgstr "" +msgstr "نسق تاريخ مجهول" #: methods/http.cc:773 -#, fuzzy msgid "Select failed" -msgstr " neserketî." +msgstr "فشل التحديد" #: methods/http.cc:778 msgid "Connection timed out" -msgstr "" +msgstr "انتهى وقت الاتصال" #: methods/http.cc:801 -#, fuzzy msgid "Error writing to output file" -msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" +msgstr "خطأ في الكتابة إلى ملف المُخرجات" #: methods/http.cc:832 -#, fuzzy msgid "Error writing to file" -msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" +msgstr "خطأ في الكتابة إلى الملف" #: methods/http.cc:860 -#, fuzzy msgid "Error writing to the file" -msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" +msgstr "خطأ في الكتابة إلى الملف" #: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" -msgstr "" +msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال" #: methods/http.cc:876 msgid "Error reading from server" -msgstr "" +msgstr "خطأ في القراءة من الخادم" #: methods/http.cc:1107 msgid "Bad header data" -msgstr "" +msgstr "بيانات ترويسة سيئة" #: methods/http.cc:1124 msgid "Connection failed" -msgstr "" +msgstr "فشل الاتصال" #: methods/http.cc:1215 msgid "Internal error" -msgstr "" +msgstr "خطأ داخلي" #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" @@ -1865,22 +1855,22 @@ msgstr "" #: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" -msgstr "" +msgstr "تعذر العثور على التحديد %s" #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "" +msgstr "اختصار نوع مجهول: '%c'" #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" -msgstr "" +msgstr "فتح ملف التهيئة %s" #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" -msgstr "" +msgstr "السطر %d طويل جداً (أقصاه %d)" #: apt-pkg/contrib/configuration.cc:608 #, c-format @@ -1925,23 +1915,23 @@ msgstr "" #: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Error!" -msgstr "" +msgstr "%c%s... خطأ!" #: apt-pkg/contrib/progress.cc:156 #, c-format msgid "%c%s... Done" -msgstr "" +msgstr "%c%s... تمّ" #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "" +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 "" +msgstr "خيار سطر الأمر %s غير مفهوم" #: apt-pkg/contrib/cmndline.cc:127 #, c-format @@ -1951,7 +1941,7 @@ msgstr "" #: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 #, c-format msgid "Option %s requires an argument." -msgstr "" +msgstr "الخيار %s يتطلّب مُعطى." #: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 #, c-format @@ -1964,9 +1954,9 @@ msgid "Option %s requires an integer argument, not '%s'" msgstr "" #: apt-pkg/contrib/cmndline.cc:268 -#, fuzzy, c-format +#, c-format msgid "Option '%s' is too long" -msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" +msgstr "الخيار '%s' طويل جداً" #: apt-pkg/contrib/cmndline.cc:301 #, c-format @@ -1976,17 +1966,17 @@ msgstr "" #: apt-pkg/contrib/cmndline.cc:351 #, c-format msgid "Invalid operation %s" -msgstr "" +msgstr "عمليّة غير صالحة %s" #: apt-pkg/contrib/cdromutl.cc:55 -#, fuzzy, c-format +#, c-format msgid "Unable to stat the mount point %s" -msgstr "Nivîsandin ji bo %s ne pêkane" +msgstr "" #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 -#, fuzzy, c-format +#, c-format msgid "Unable to change to %s" -msgstr "Nivîsandin ji bo %s ne pêkane" +msgstr "" #: apt-pkg/contrib/cdromutl.cc:190 msgid "Failed to stat the cdrom" @@ -1998,9 +1988,9 @@ msgid "Not using locking for read only lock file %s" msgstr "" #: apt-pkg/contrib/fileutl.cc:87 -#, fuzzy, c-format +#, c-format msgid "Could not open lock file %s" -msgstr "Danegira %s nehate vekirin: %s" +msgstr "" #: apt-pkg/contrib/fileutl.cc:105 #, c-format @@ -2033,9 +2023,9 @@ msgid "Sub-process %s exited unexpectedly" msgstr "" #: apt-pkg/contrib/fileutl.cc:436 -#, fuzzy, c-format +#, c-format msgid "Could not open file %s" -msgstr "Danegira %s nehate vekirin: %s" +msgstr "" #: apt-pkg/contrib/fileutl.cc:492 #, c-format @@ -2049,7 +2039,7 @@ msgstr "" #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" -msgstr "" +msgstr "مشكلة في إغلاق الملف" #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" @@ -2057,7 +2047,7 @@ msgstr "" #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" -msgstr "" +msgstr "مشكلة في مزامنة الملف" #: apt-pkg/pkgcache.cc:126 msgid "Empty package cache" @@ -2082,75 +2072,73 @@ 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 -#, fuzzy msgid "Recommends" -msgstr "Paketên tên tawsiyê kirin:" +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:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "" #: apt-pkg/depcache.cc:62 -#, fuzzy msgid "Candidate versions" -msgstr " Berendam: " +msgstr "" #: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 -#, fuzzy, c-format +#: apt-pkg/tagfile.cc:106 +#, c-format msgid "Unable to parse package file %s (1)" -msgstr "Pakêt nehate dîtin %s" +msgstr "" -#: apt-pkg/tagfile.cc:186 -#, fuzzy, c-format +#: apt-pkg/tagfile.cc:193 +#, c-format msgid "Unable to parse package file %s (2)" -msgstr "Pakêt nehate dîtin %s" +msgstr "" #: apt-pkg/sourcelist.cc:94 #, c-format @@ -2180,7 +2168,7 @@ msgstr "" #: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" -msgstr "" +msgstr "فتح %s" #: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format @@ -2264,23 +2252,23 @@ msgid "Method %s did not start correctly" msgstr "" #: 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 "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne" +msgstr "الرجاء إدخال القرص المُسمّى '%s' في السوّاقة '%s' وضغط مفتاح الإدخال." #: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "" +msgstr "نظام الحزم '%s' غير مدعوم" #: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" #: apt-pkg/clean.cc:61 -#, fuzzy, c-format +#, c-format msgid "Unable to stat %s." -msgstr "Nivîsandin ji bo %s ne pêkane" +msgstr "" #: apt-pkg/srcrecords.cc:48 msgid "You must put some 'source' URIs in your sources.list" @@ -2292,7 +2280,7 @@ msgstr "" #: apt-pkg/cachefile.cc:77 msgid "You may want to run apt-get update to correct these problems" -msgstr "" +msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل" #: apt-pkg/policy.cc:269 msgid "Invalid record in the preferences file, no Package header" @@ -2314,37 +2302,37 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:117 #, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "" +msgstr "حدث خطأ أثناء معالجة %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "" +msgstr "حدث خطأ أثناء معالجة %s (UserPackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "" +msgstr "حدث خطأ أثناء معالجة %s (UserPackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "" +msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "" +msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "" +msgstr "حدث خطأ أثناء معالجة %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "" +msgstr "حدث خطأ أثناء معالجة %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." @@ -2389,14 +2377,14 @@ msgstr "" #: apt-pkg/acquire-item.cc:126 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "" +msgstr "فشل إعادة التسمية ، %s (%s -> %s)." #: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" -msgstr "" +msgstr "MD5Sum غير متطابقة" #: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +msgid "There is no public key available for the following key IDs:\n" msgstr "" #: apt-pkg/acquire-item.cc:753 @@ -2421,7 +2409,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" -msgstr "" +msgstr "الحجم غير متطابق" #: apt-pkg/vendorlist.cc:66 #, c-format @@ -2437,7 +2425,7 @@ msgstr "" #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " -msgstr "" +msgstr "جاري التعرف..." #: apt-pkg/cdrom.cc:541 #, c-format @@ -2451,16 +2439,16 @@ msgstr "" #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" -msgstr "" +msgstr "فك تركيب القرص المدمج\n" #: apt-pkg/cdrom.cc:583 msgid "Waiting for disc...\n" -msgstr "" +msgstr "بانتظار القرص...\n" #. Mount the new CDROM #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" -msgstr "" +msgstr "تركيب القرص...\n" #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" @@ -2473,7 +2461,7 @@ msgstr "" #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" -msgstr "" +msgstr "هذا الاسم غير صالح، حاول مجدداً.\n" #: apt-pkg/cdrom.cc:726 #, c-format @@ -2481,14 +2469,16 @@ msgid "" "This disc is called: \n" "'%s'\n" msgstr "" +"هذا القرص مسمى: \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 "" +msgstr "كتابة لائحة المصادر الجديدة\n" #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" @@ -2496,7 +2486,7 @@ msgstr "" #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." -msgstr "" +msgstr "فك تركيب القرص المدمج..." #: apt-pkg/indexcopy.cc:261 #, c-format @@ -2521,54 +2511,56 @@ msgstr "" #: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Preparing %s" -msgstr "" +msgstr "تحضير %s" #: apt-pkg/deb/dpkgpm.cc:359 #, c-format msgid "Unpacking %s" -msgstr "" +msgstr "فتح %s" #: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Preparing to configure %s" -msgstr "" +msgstr "التحضير لتهيئة %s" #: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Configuring %s" -msgstr "" +msgstr "تهيئة %s" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Sazkirî: " +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 #, c-format msgid "Removing %s" -msgstr "" +msgstr "إزالة %s" #: apt-pkg/deb/dpkgpm.cc:373 #, c-format msgid "Removed %s" -msgstr "" +msgstr "تم إزالة %s" #: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Preparing to completely remove %s" -msgstr "" +msgstr "التحضير لإزالة %s بالكامل" #: apt-pkg/deb/dpkgpm.cc:379 #, c-format msgid "Completely removed %s" -msgstr "" +msgstr "تمت إزالة %s بالكامل" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "" +#~ msgid "File date has changed %s" +#~ msgstr "تغير تاريخ الملف %s" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" -"PO-Revision-Date: 2006-03-31 22:05+0300\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"PO-Revision-Date: 2006-10-12 20:14+0300\n" "Last-Translator: Yavor Doganov <yavor@doganov.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "MIME-Version: 1.0\n" @@ -150,7 +150,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s за %s %s, компилиран на %s %s\n" @@ -433,115 +433,128 @@ msgstr "Няма съвпадения на избора" msgid "Some files are missing in the package file group `%s'" msgstr "Липсват някои файлове от групата с файлови пакети „%s“" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "БД е повредена, файлът е преименуван на %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "БД е стара, опит за актуализиране на %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"Форматът на БД е невалиден. Ако сте обновили от стара версия на apt, " +"премахнете базата от данни и я създайте наново." + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Неуспех при отварянето на файл %s от БД: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Датата на файла %s е променена" +msgid "Failed to stat %s" +msgstr "Грешка при получаването на атрибути за %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "В архива няма поле „control“" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Неуспех при получаването на курсор" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Неуспех при четенето на директория %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Неуспех при четенето на %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Грешките се отнасят за файла " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Неуспех при превръщането на %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Неуспех при обхода на дървото" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Неуспех при отварянето на %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr "DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Неуспех при прочитането на връзка %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Неуспех при премахването на връзка %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Неуспех при създаването на връзка %s към %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "Превишен лимит на DeLink от %sB.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Грешка при получаването на атрибути за %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Архивът няма поле „package“" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s няма запис „override“\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " поддържащия пакета %s е %s, а не %s\n" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s няма запис „source override“\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s няма също и запис „binary override“\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -804,11 +817,11 @@ msgstr "Трябва да бъдат премахнати пакети, но п msgid "Internal error, Ordering didn't finish" msgstr "Вътрешна грешка, „Ordering“ не завърши" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Неуспех при заключването на директорията за изтегляне" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Списъкът с източници не можа да бъде прочетен." @@ -838,7 +851,7 @@ msgstr "След разпакетирането ще бъде използван msgid "After unpacking %sB disk space will be freed.\n" msgstr "След разпакетирането ще бъде освободено %sB дисково пространство.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "Неуспех при определянето на свободното пространство в %s" @@ -875,7 +888,7 @@ msgstr "Прекъсване." msgid "Do you want to continue [Y/n]? " msgstr "Искате ли да продължите [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" @@ -884,7 +897,7 @@ msgstr "Неуспех при изтеглянето на %s %s\n" msgid "Some files failed to download" msgstr "Някои файлове не можаха да бъдат изтеглени" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Изтеглянето завърши в режим само на изтегляне" @@ -1058,110 +1071,110 @@ msgstr "Счупени пакети" msgid "The following extra packages will be installed:" msgstr "Следните допълнителни пакети ще бъдат инсталирани:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Предложени пакети:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Препоръчвани пакети:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Изчисляване на актуализацията..." -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Неуспех" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Неуспех при намирането на изходен код на пакет %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускане на вече изтегления файл „%s“\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "Нямате достатъчно свободно пространство в %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Изтегляне на изходен код %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Неуспех при изтеглянето на някои архиви." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Командата за разпакетиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Командата за компилиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Процесът-потомък пропадна" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" "Трябва да укажете поне един пакет за проверка на зависимости за компилиране" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Неуспех при получаването на информация за зависимостите за компилиране на %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s няма зависимости за компилиране.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1170,7 +1183,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "не може да бъде намерен" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1180,32 +1193,32 @@ msgstr "" "налични версии на пакета %s, които могат да удовлетворят изискването за " "версия" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният " "пакет %s е твърде нов" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Неуспех при обработката на зависимостите за компилиране" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Поддържани модули:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1388,19 +1401,19 @@ msgstr "Смесване на наличната информация" msgid "Failed to create pipes" msgstr "Неуспех при създаването на програмни канали" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Неуспех при изпълнението на gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Развален архив" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Невярна контролна сума на tar, развален архив" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Непозната заглавна част на TAR тип %u, елемент %s" @@ -1668,25 +1681,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Грешен CD-ROM" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, 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 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Дискът не е намерен." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 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 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Неуспех при получаването на атрибути" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Неуспех при задаването на време на промяна" @@ -1816,7 +1829,7 @@ msgstr "Времето за установяване на връзка с гне msgid "Unable to accept connection" msgstr "Невъзможно е да се приеме свързването" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблем при хеширане на файла" @@ -1900,42 +1913,44 @@ msgstr "Нещо лошо се случи при намирането на IP а msgid "Unable to connect to %s %s:" msgstr "Неуспех при свързването с %s %s:" -#: methods/gpgv.cc:64 -#, fuzzy, c-format +#: methods/gpgv.cc:65 +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Неуспех при намирането на IP адреса на „%s“" +msgstr "Неуспех при достъпа до набор на ключове: „%s“" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Списъкът с аргументи от Acquire::gpgv::Options е твърде дълъг. Завършване " "на работа." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на " "ключа?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Намерен е поне един невалиден подпис." -#: methods/gpgv.cc:207 -#, fuzzy, c-format +#: methods/gpgv.cc:213 +#, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr " за проверка на подписа (инсталиран ли е gnupg?)" +msgstr "" +"Неуспех при изпълнението на „%s“ за проверка на подписа (инсталиран ли е " +"gnupg?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Неизвестна грешка при изпълнението на gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Следните подписи са невалидни:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1943,86 +1958,86 @@ msgstr "" "Следните подписи не можаха да бъдат проверени, защото публичния ключ не е " "наличен:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Неуспех при отварянето на програмен канал за %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Грешка при четене от процес %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Чакане на заглавни части" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Получен е един ред на заглавна част с над %u символа" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Невалиден ред на заглавна част" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Неизвестен формат на дата" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Неуспех на избора" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Допустимото време за свързване изтече" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Грешка при записа на изходен файл" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Грешка при записа на файл" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Грешка при записа на файла" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Грешка при четене от сървъра" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Невалидни данни на заглавната част" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Неуспех при свързването" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Вътрешна грешка" @@ -2097,12 +2112,12 @@ msgstr "Синтактична грешка %s:%u: Неподдържана ди msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Грешка!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Готово" @@ -2318,12 +2333,12 @@ msgstr "Версии кандидати" msgid "Dependency generation" msgstr "Генериране на зависимости" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Неуспех при анализирането на пакетен файл %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Неуспех при анализирането на пакетен файл %s (2)" @@ -2407,7 +2422,7 @@ msgstr "" "Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за " "него." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2415,7 +2430,7 @@ msgstr "" "Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е " "причинено от задържани пакети." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Неуспех при коригирането на проблемите, имате задържани счупени пакети." @@ -2432,15 +2447,15 @@ msgstr "Директорията за архиви %spartial липсва." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:830 +#, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Изтегляне на файл %li от %li (остават %s)" -#: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:832 +#, c-format msgid "Retrieving file %li of %li" -msgstr "Четене на списъка на файловете" +msgstr "Изтегляне на файл %li от %li" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2486,16 +2501,16 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Невалиден запис във файла с настройки, няма заглавна част Package" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Неизвестен тип за отбиване %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Няма указан приоритет (или е нула) на отбиването" @@ -2587,15 +2602,15 @@ msgstr "Входно/изходна грешка при запазването msgid "rename failed, %s (%s -> %s)." msgstr "преименуването се провали, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "Несъответствие на контролна сума MD5" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2604,7 +2619,7 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет (поради пропусната архитектура)." -#: apt-pkg/acquire-item.cc:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2613,14 +2628,14 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет." -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s." -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Несъответствие на размера" @@ -2676,11 +2691,16 @@ msgstr "" "Намерени са %i индекса на пакети, %i индекса на пакети с изходен код и %i " "подписа.\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Запазен етикет: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Това не е валидно име, опитайте отново.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2689,20 +2709,21 @@ msgstr "" "Наименование на този диск: \n" "„%s“\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Копиране на списъците с пакети..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Запазване на новия списък с източници\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Записите в списъка с източници за този диск са:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "Демонтиране на CD-ROM..." #: apt-pkg/indexcopy.cc:261 @@ -2766,48 +2787,15 @@ msgid "Removed %s" msgstr "%s е премахнат" #: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#, c-format msgid "Preparing to completely remove %s" -msgstr "Подготвяне на %s за конфигуриране" +msgstr "Подготовка за пълно премахване на %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#, c-format msgid "Completely removed %s" -msgstr "Неуспех при премахването на %s" +msgstr "%s е напълно премахнат" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Връзката прекъсна преждевременно" - -#: ftparchive/cachedb.cc:76 -msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " -"remove and re-create the database." -msgstr "" - -#: ftparchive/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s няма запис „override“\n" - -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s няма запис „override“\n" - -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Неуспех при отварянето на файла %s" - -#~ 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: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n" "Language-Team: Bosnian <lokal@lugbih.org>\n" @@ -147,7 +147,7 @@ msgstr "" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -339,115 +339,126 @@ msgstr "" msgid "Some files are missing in the package file group `%s'" msgstr "" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB je bila oštećena, datoteka preimenovana u %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB je stara, pokušavam nadogradnju %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, fuzzy, c-format msgid "Unable to open DB file %s: %s" msgstr "Ne mogu otvoriti DB datoteku %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Datum datoteke je promijenjen %s" +msgid "Failed to stat %s" +msgstr "" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arhiva nema kontrolnog zapisa" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "" -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "" -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Ne mogu otvoriti %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr "" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr "" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -708,11 +719,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -741,7 +752,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -776,7 +787,7 @@ msgstr "Odustani." msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -785,7 +796,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "" @@ -942,144 +953,144 @@ msgstr "Oštećeni paketi" msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Predloženi paketi:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Preporučeni paketi:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Neuspješno" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Urađeno" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Podržani moduli:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1207,19 +1218,19 @@ msgstr "Sastavljam dostupne informacije" msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Ne mogu izvršiti gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Oštećena arhiva" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" @@ -1482,26 +1493,26 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Pogrešan CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Ne mogu demontirati CD-ROM na %s, moguće je da se još uvijek koristi." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 #, fuzzy msgid "Disk not found." msgstr "Datoteka nije pronađena" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Datoteka nije pronađena" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "" @@ -1628,7 +1639,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1712,124 +1723,124 @@ msgstr "" msgid "Unable to connect to %s %s:" msgstr "Ne mogu se povezati sa %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Čekam na zaglavlja" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Povezivanje neuspješno" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Unutrašnja greška" @@ -1902,12 +1913,12 @@ msgstr "" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "" @@ -2121,12 +2132,12 @@ msgstr "Verzije kandidata" msgid "Dependency generation" msgstr "Stvaranje zavisnosti" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" @@ -2200,13 +2211,13 @@ 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:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "" @@ -2222,12 +2233,12 @@ msgstr "" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:832 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Čitam spisak datoteke" @@ -2273,16 +2284,16 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "" @@ -2370,35 +2381,35 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, 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:812 +#: apt-pkg/acquire-item.cc:819 #, 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:848 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "" @@ -2451,33 +2462,39 @@ msgstr "" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, c-format +msgid "Found label '%s'\n" +msgstr "" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 #, fuzzy msgid "Copying package lists..." msgstr "Čitam spiskove paketa" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "" +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "Pogrešan CD" #: apt-pkg/indexcopy.cc:261 #, c-format @@ -2553,22 +2570,5 @@ msgstr "Ne mogu ukloniti %s" msgid "Connection closed prematurely" msgstr "" -#: ftparchive/cachedb.cc:76 -msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " -"remove and re-create the database." -msgstr "" - -#: ftparchive/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 "" - -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "" +#~ msgid "File date has changed %s" +#~ msgstr "Datum datoteke je promijenjen %s" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\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" @@ -150,7 +150,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s per a %s %s compilat el %s %s\n" @@ -426,114 +426,127 @@ msgstr "No s'ha trobat cap selecció" msgid "Some files are missing in the package file group `%s'" msgstr "No es troben alguns fitxers dins del grup de fitxers del paquet `%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "La base de dades està corrompuda, fitxer renomenat a %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "La BD és vella, s'està intentant actualitzar %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"El format de la base de dades és invàlid. Si heu actualitzat des d'una " +"versió més antiga de l'apt, eliminieu i torneu a crear la base de dades." + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "No es pot obrir el fitxer de DB %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "La data del fitxer ha canviat %s" +msgid "Failed to stat %s" +msgstr "No es pot determinar l'estat de %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arxiu sense registre de control" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "No es pot aconseguir un cursor" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: No es pot llegir el directori %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: No es pot veure l'estat %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Els errors s'apliquen al fitxer " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "No s'ha pogut resoldre %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "L'arbre està fallant" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "No s'ha pogut obrir %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "No s'ha pogut llegir l'enllaç %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "No s'ha pogut alliberar %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** No s'ha pogut enllaçar %s a %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink s'ha arribat al límit de %sB.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "No es pot determinar l'estat de %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Arxiu sense el camp paquet" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" -msgstr " %s no té una entrada dominant\n" +msgstr " %s no té una entrada dominant\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" -msgstr " el mantenidor de %s és %s, no %s\n" +msgstr " el mantenidor de %s és %s, no %s\n" + +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s no té una entrada dominant de font\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s no té una entrada dominant de binari\n" #: ftparchive/contents.cc:317 #, c-format @@ -797,11 +810,11 @@ msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat." msgid "Internal error, Ordering didn't finish" msgstr "S'ha produït un error intern, l'ordenació no ha acabat" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: 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." @@ -831,7 +844,7 @@ msgstr "Després de desempaquetar s'usaran %sB d'espai en disc addicional.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Després de desempaquetar s'alliberaran %sB d'espai en disc.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" @@ -868,7 +881,7 @@ msgstr "Avortat." msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" @@ -877,7 +890,7 @@ msgstr "No s'ha pogut obtenir %s %s\n" msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut descarregar" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Descàrrega completa i en mode de només descàrrega" @@ -1052,112 +1065,112 @@ msgstr "Paquets trencats" msgid "The following extra packages will be installed:" msgstr "S'instal·laran els següents paquets extres:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Ha fallat" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Fet" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "" "S'ha produït un error intern, el solucionador de problemes ha trencat coses" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a descarregar" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "No es pot trobar un paquet de fonts per a %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "S'està ometent el fitxer ja descarregat «%s»\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita descarregar %sB/%sB d'arxius font.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita descarregar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Font descarregada %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "No s'ha pogut descarregar alguns arxius." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" "S'ha d'especificar un paquet per a verificar les dependències de construcció " "per a" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "No es pot obtenir informació sobre les dependències de construcció per a %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1166,7 +1179,7 @@ msgstr "" "La dependència %s en %s no es pot satisfer per que no es pot trobar el " "paquet %s" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1175,32 +1188,32 @@ msgstr "" "La dependència %s per a %s no es pot satisfer per que cap versió del paquet %" "s pot satisfer els requeriments de versions" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s " "és massa nou" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No s'han pogut satisfer les dependències de construcció per a %s" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1385,19 +1398,19 @@ msgstr "S'està fusionant la informació disponible" msgid "Failed to create pipes" msgstr "No es poden crear els conductes" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "No es pot executar el gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Arxiu corromput" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "La suma de comprovació de tar ha fallat, arxiu corromput" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Capçalera TAR desconeguda del tipus %u, membre %s" @@ -1666,25 +1679,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "CD erroni" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format 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 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "No s'ha trobat el disc" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fitxer no trobat" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "L'estat ha fallat" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" @@ -1813,7 +1826,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:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" @@ -1890,49 +1903,51 @@ msgstr "S'ha produït un error temporal en resoldre '%s'" #: 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)" +msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i)" #: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "No es pot connectar amb %s %s:" -#: methods/gpgv.cc:64 -#, fuzzy, c-format +#: methods/gpgv.cc:65 +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "No s'ha pogut resoldre '%s'" +msgstr "No s'ha pogut accedir a l'anell de claus: «%s»" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està " "sortint." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error intern: La signatura és correcta, però no s'ha pogut determinar " "l'emprempta digital de la clau!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "S'ha trobat almenys una signatura invàlida." -#: methods/gpgv.cc:207 -#, fuzzy, c-format +#: methods/gpgv.cc:213 +#, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr " per a verificar la signatura (està instal·lat el gnupg?)" +msgstr "" +"No s'ha pogut executar «%s» per a verificar la signatura (està instal·lat el " +"gnupg?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "S'ha produït un error desconegut en executar el gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Les següents signatures són invàlides:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1940,86 +1955,86 @@ msgstr "" "Les següents signatures no s'han pogut verificar perquè la clau pública no " "està disponible:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "No s'ha pogut obrir un conducte per a %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Error llegint des del procés %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "S'estan esperant les capçaleres" -#: methods/http.cc:522 +#: methods/http.cc:523 #, 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:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Línia de capçalera incorrecta" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 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:585 +#: methods/http.cc:586 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:600 +#: methods/http.cc:601 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:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Aquest servidor http té el suport d'abast trencat" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Error escrivint en el fitxer d'eixida" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Error llegint, el servidor remot ha tancat la connexió" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Error llegint des del servidor" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Error intern" @@ -2092,12 +2107,12 @@ msgstr "Error sintàctic %s:%u: Directriu no suportada '%s'" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Error sintàctic %s:%u: Text extra al final del fitxer" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Error!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fet" @@ -2310,12 +2325,12 @@ msgstr "Versions candidates" msgid "Dependency generation" msgstr "Dependències que genera" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "No es pot analitzar el fitxer del paquet %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "No es pot analitzar el fitxer del paquet %s (2)" @@ -2394,7 +2409,7 @@ msgid "" msgstr "" "El paquet %s necessita ser reinstal·lat, però no se li pot trobar un arxiu." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2402,7 +2417,7 @@ msgstr "" "Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat " "causat per paquets mantinguts." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No es poden corregir els problemes, teniu paquets mantinguts que estan " @@ -2420,15 +2435,15 @@ msgstr "Falta el directori d'arxiu %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:830 +#, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "S'està baixant el fitxer %li de %li (falten %s)" +msgstr "S'està obtenint el fitxer %li de %li (falten %s)" -#: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:832 +#, c-format msgid "Retrieving file %li of %li" -msgstr "S'està llegint el llistat de fitxers" +msgstr "S'està obtenint el fitxer %li de %li" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2473,16 +2488,16 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Potser voldreu executar apt-get update per a corregir aquests problemes" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Registre no vàlid en el fitxer de preferències, paquet sense capçalera" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "No s'ha entès el pin de tipus %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "No hi ha prioritat especificada per al pin (o és zero)" @@ -2574,15 +2589,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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "Suma MD5 diferent" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2592,7 +2607,7 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2601,7 +2616,7 @@ msgstr "" "No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu " "d'arreglar aquest paquet manualment." -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2609,7 +2624,7 @@ msgstr "" "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "La mida no concorda" @@ -2663,11 +2678,16 @@ msgstr "S'està analitzant el disc per a fitxers d'índex...\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "S'han trobat %i índex de paquets, %i índex de fonts i %i signatures\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "S'ha emmagatzemat l'etiqueta: %s\n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Aquest no és un nom vàlid, torneu-ho a provar.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2676,20 +2696,21 @@ msgstr "" "El disc es diu:\n" "«%s»\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "S'estan copiant les llistes de paquets..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "S'està escrivint una nova llista de fonts\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Les entrades de la llista de fonts per a aquest disc són:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "S'esta desmuntant el CD-ROM..." #: apt-pkg/indexcopy.cc:261 @@ -2717,7 +2738,7 @@ msgstr "" #: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Preparing %s" -msgstr "S'està preparant %s" +msgstr "S'està preparant el paquet %s" #: apt-pkg/deb/dpkgpm.cc:359 #, c-format @@ -2727,67 +2748,49 @@ msgstr "S'està desempaquetant %s" #: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Preparing to configure %s" -msgstr "S'està preparant per a configurar %s" +msgstr "S'està preparant per a configurar el paquet %s" #: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Configuring %s" -msgstr "S'està configurant %s" +msgstr "S'està configurant el paquet %s" #: apt-pkg/deb/dpkgpm.cc:366 #, c-format msgid "Installed %s" -msgstr "S'ha instal·lat %s" +msgstr "S'ha instal·lat el paquet %s" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "S'està preparant per a l'eliminació de %s" +msgstr "S'està preparant per a l'eliminació del paquet %s" #: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removing %s" -msgstr "S'està eliminant %s" +msgstr "S'està eliminant el paquet %s" #: apt-pkg/deb/dpkgpm.cc:373 #, c-format msgid "Removed %s" -msgstr "S'ha eliminat %s" +msgstr "S'ha eliminat el paquet %s" #: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#, c-format msgid "Preparing to completely remove %s" -msgstr "S'està preparant per a configurar %s" +msgstr "S'està preparant per a eliminar completament el paquet %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#, c-format msgid "Completely removed %s" -msgstr "No es pot eliminar %s" +msgstr "S'ha eliminat completament el paquet %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "La connexió s'ha tancat prematurament" -#: 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/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s no té una entrada dominant\n" - -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s no té una entrada dominant\n" - -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "No s'ha pogut obrir el fitxer %s" +#~ msgid "File date has changed %s" +#~ msgstr "La data del fitxer ha canviat %s" #~ msgid "Reading file list" #~ msgstr "S'està llegint la llista de fitxers" @@ -2,12 +2,13 @@ # This file is put in the public domain. # Miroslav Kure <kurem@debian.cz>, 2004-2006. # +# msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" -"PO-Revision-Date: 2006-05-14 18:36+0200\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"PO-Revision-Date: 2006-10-04 18:53+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -147,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pro %s %s zkompilován na %s %s\n" @@ -420,115 +421,128 @@ msgstr "Žádný výběr nevyhověl" msgid "Some files are missing in the package file group `%s'" msgstr "Některé soubory chybí v balíkovém souboru skupiny %s" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB je porušená, soubor přejmenován na %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB je stará, zkouším aktualizovat %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"Formát databáze je neplatný. Pokud jste přešli ze starší verze apt, databázi " +"prosím odstraňte a poté ji znovu vytvořte." + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nemohu otevřít DB soubor %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Datum souboru se změnil %s" +msgid "Failed to stat %s" +msgstr "Nemohu vyhodnotit %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archiv nemá kontrolní záznam" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Nemohu získat kurzor" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Nemohu číst adresář %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Nemohu vyhodnotit %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Chyby se týkají souboru " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Chyba při zjišťování %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Průchod stromem selhal" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Nelze otevřít %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr "Odlinkování %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Nemohu přečíst link %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Nemohu odlinkovat %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Nezdařilo se slinkovat %s s %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Odlinkovací limit %sB dosažen.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Nemohu vyhodnotit %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Archiv nemá pole Package" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá žádnou položku pro override\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správce %s je %s, ne %s\n" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s nemá žádnou zdrojovou položku pro override\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s nemá ani žádnou binární položku pro override\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -789,11 +803,11 @@ msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta." msgid "Internal error, Ordering didn't finish" msgstr "Vnitřní chyba, třídění nedoběhlo do konce" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Nemohu zamknout adresář pro stahování" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nelze přečíst seznam zdrojů." @@ -823,7 +837,7 @@ msgstr "Po rozbalení bude na disku použito dalších %sB.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení bude na disku uvolněno %sB.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nemohu určit volné místo v %s" @@ -860,7 +874,7 @@ msgstr "Přerušeno." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" @@ -869,7 +883,7 @@ msgstr "Selhalo stažení %s %s\n" msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" @@ -1041,116 +1055,116 @@ msgstr "Poškozené balíky" msgid "The following extra packages will be installed:" msgstr "Následující extra balíky budou instalovány:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Doporučované balíky:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Selhalo" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "Vnitřní chyba, řešitel problémů pokazil věci" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Nemohu najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Přeskakuji dříve stažený soubor '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Stáhnout zdroj %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Stažení některých archivů selhalo." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení '%s' selhal.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Zkontrolujte, zda je nainstalován balíček 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení '%s' selhal.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti " "pro sestavení" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemohu získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1159,31 +1173,31 @@ msgstr "" "%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku " "%s, která odpovídá požadavku na verzi" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění %s závislosti pro %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pro sestavení %s nemohly být splněny." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1361,19 +1375,19 @@ msgstr "Slučuji dostupné informace" msgid "Failed to create pipes" msgstr "Selhalo vytvoření roury" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Selhalo spuštění gzipu " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Porušený archiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Kontrolní součet taru selhal, archiv je poškozený" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Neznámá hlavička TARu typ %u, člen %s" @@ -1640,25 +1654,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Chybné CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format 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 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disk nebyl nalezen." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Soubor nebyl nalezen" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Selhalo vyhodnocení" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" @@ -1786,7 +1800,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:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashováním souboru" @@ -1870,39 +1884,39 @@ msgstr "Něco hodně ošklivého se přihodilo při zjišťování '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "Nemohu se připojit k %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "Nemohu přistoupit ke klíčence: '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Seznam argumentů Acquire::gpgv::Options je příliš dlouhý. Končím." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Byl zaznamenán nejméně jeden neplatný podpis. " -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" "Nepodařilo se spustit '%s' pro ověření podpisu (je gnupg nainstalováno?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Neznámá chyba při spouštění gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Následující podpisy jsou neplatné:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1910,86 +1924,86 @@ msgstr "" "Následující podpisy nemohly být ověřeny, protože není dostupný veřejný " "klíč:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Nemohu otevřít rouru pro %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Chyba čtení z procesu %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Čekám na hlavičky" -#: methods/http.cc:522 +#: methods/http.cc:523 #, 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:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Chybná hlavička" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Http server poslal neplatnou hlavičku odpovědi" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http server poslal neplatnou hlavičku Content-Length" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http server poslal neplatnou hlavičku Content-Range" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má porouchanou podporu rozsahů" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Čas spojení vypršel" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Špatné datové záhlaví" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Vnitřní chyba" @@ -2063,12 +2077,12 @@ msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva '%s'" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaktická chyba %s:%u: Na konci souboru je zbytečné smetí" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Chyba!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Hotovo" @@ -2281,12 +2295,12 @@ msgstr "Kandidátské verze" msgid "Dependency generation" msgstr "Generování závislostí" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nelze zpracovat soubor %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" @@ -2363,7 +2377,7 @@ 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 archiv." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2371,7 +2385,7 @@ msgstr "" "Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno " "podrženými balíky." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "Nemohu opravit problémy, některé balíky držíte v porouchaném stavu." @@ -2387,12 +2401,12 @@ msgstr "Archivní adresář %spartial chybí." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Stahuji soubor %li z %li (%s zbývá)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:832 #, c-format msgid "Retrieving file %li of %li" msgstr "Stahuji soubor %li z %li" @@ -2439,16 +2453,16 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Pro nápravu těchto problémů můžete zkusit spustit apt-get update" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Neplatný záznam v souboru preferencí, žádné záhlaví balíku" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Nerozumím vypíchnutí typu %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita" @@ -2538,15 +2552,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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "Neshoda MD5 součtů" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2555,7 +2569,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:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2564,14 +2578,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:848 +#: apt-pkg/acquire-item.cc:855 #, 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:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" @@ -2625,11 +2639,16 @@ msgstr "Hledám na disku indexové soubory...\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Nalezl jsem indexy balíků (%i), indexy zdrojů (%i) a podpisy (%i)\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Uložený název: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Nejedná se o platné jméno, zkuste to znovu.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2638,20 +2657,21 @@ msgstr "" "Tento disk se nazývá: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Kopíruji seznamy balíků..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Zapisuji nový seznam balíků\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Seznamy zdrojů na tomto disku jsou:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "Odpojuji CD-ROM..." #: apt-pkg/indexcopy.cc:261 @@ -2729,26 +2749,8 @@ msgstr "Kompletně odstraněn %s" msgid "Connection closed prematurely" msgstr "Spojení bylo předčasně ukončeno" -#: 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/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s nemá žádnou položku pro override\n" - -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s nemá žádnou položku pro override\n" - -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Nemohu otevřít soubor %s" +#~ msgid "File date has changed %s" +#~ msgstr "Datum souboru se změnil %s" #~ msgid "Reading file list" #~ msgstr "Čtu seznam souborů" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n" "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n" @@ -164,7 +164,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" @@ -449,116 +449,127 @@ msgstr "Dim dewisiadau'n cyfateb" msgid "Some files are missing in the package file group `%s'" msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Hen gronfa data, yn ceisio uwchraddio %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Ni ellir agor y ffeil DB2 %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Dyddiad ffeil wedi newid %s" +msgid "Failed to stat %s" +msgstr "Methodd stat() o %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Does dim cofnod rheoli gan yr archif" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Ni ellir cael cyrchydd" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "Rh: Ni ellir gwneud stat() o %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "G: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "Rh: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "G: Mae gwallau yn cymhwyso i'r ffeil " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Methwyd datrys %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Methwyd cerdded y goeden" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Methwyd agor %s" # FIXME -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DatGysylltu %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Methwyd darllen y cyswllt %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Methwyd datgysylltu %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Methwyd cysylltu %s at %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Methodd stat() o %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" + #: ftparchive/contents.cc:317 #, fuzzy, c-format msgid "Internal error, could not locate member %s" @@ -829,11 +840,11 @@ msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Methwyd darllen y rhestr ffynhonellau." @@ -862,7 +873,7 @@ msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" @@ -900,7 +911,7 @@ msgstr "Erthylu." msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" @@ -909,7 +920,7 @@ msgstr "Methwyd cyrchu %s %s\n" msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" @@ -1088,110 +1099,110 @@ msgstr "Pecynnau wedi torri" msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1200,7 +1211,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %" "s" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1209,34 +1220,34 @@ msgstr "" "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd " "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " "newydd" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1422,20 +1433,20 @@ msgstr "Yn cyfuno manylion Ar Gael" msgid "Failed to create pipes" msgstr "Methwyd creu pibau" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Methwyd gweithredu gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Archif llygredig" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 #, fuzzy msgid "Tar checksum failed, archive corrupted" msgstr "Methodd swm gwirio Tar, archif llygredig" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Math pennawd TAR anhysbys %u, aelod %s" @@ -1718,27 +1729,27 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "CD Anghywir" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 #, fuzzy msgid "Disk not found." msgstr "Ffeil heb ei ganfod" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Ffeil heb ei ganfod" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -1869,7 +1880,7 @@ msgstr "Goramserodd cysylltiad y soced data" msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" @@ -1954,130 +1965,130 @@ msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "Methwyd cysylltu i %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Methwyd datrys '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Methwyd agor pibell ar gyfer %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Gwall darllen o broses %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Yn aros am benawdau" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Derbynnwyd llinell pennaws sengl dros %u nod" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Llinell pennawd gwael" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 #, fuzzy msgid "The HTTP server sent an invalid reply header" msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" -#: methods/http.cc:585 +#: methods/http.cc:586 #, fuzzy msgid "The HTTP server sent an invalid Content-Length header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" -#: methods/http.cc:600 +#: methods/http.cc:601 #, fuzzy msgid "The HTTP server sent an invalid Content-Range header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" -#: methods/http.cc:602 +#: methods/http.cc:603 #, fuzzy msgid "This HTTP server has broken range support" msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:874 +#: methods/http.cc:875 #, 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:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:1107 +#: methods/http.cc:1108 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Gwall mewnol" @@ -2152,12 +2163,12 @@ msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Gwall!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Wedi Gorffen" @@ -2379,12 +2390,12 @@ msgid "Dependency generation" msgstr "Cynhyrchaid Dibyniaeth" # FIXME: number? -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" @@ -2465,7 +2476,7 @@ msgstr "" "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " "ei gyfer." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2473,7 +2484,7 @@ msgstr "" "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " "ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." @@ -2490,12 +2501,12 @@ msgstr "Mae'r cyfeiriadur archif %spartial ar goll." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:832 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Yn Darllen Rhestr Ffeiliau" @@ -2547,17 +2558,17 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn." # FIXME: literal -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'" # FIXME: tense -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Methwyd daeall y math pin %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" @@ -2647,16 +2658,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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 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" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2665,7 +2676,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:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2674,14 +2685,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:848 +#: apt-pkg/acquire-item.cc:855 #, 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:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" @@ -2734,34 +2745,40 @@ msgstr "" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, c-format +msgid "Found label '%s'\n" +msgstr "" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 #, fuzzy msgid "Copying package lists..." msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 #, fuzzy msgid "Writing new source list\n" msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "" +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "CD Anghywir" #: apt-pkg/indexcopy.cc:261 #, c-format @@ -2837,26 +2854,12 @@ msgstr "Methwyd dileu %s" msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" -#: 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/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " Does dim cofnod gwrthwneud gan %s\n" +#~ msgid "File date has changed %s" +#~ msgstr "Dyddiad ffeil wedi newid %s" -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " Does dim cofnod gwrthwneud gan %s\n" - -#: methods/rred.cc:219 #, fuzzy -msgid "Could not patch file" -msgstr "Methwyd agor ffeil %s" +#~ msgid "Could not patch file" +#~ msgstr "Methwyd agor ffeil %s" #, fuzzy #~ msgid "Reading file list" @@ -4,18 +4,19 @@ # Danish messages # # Claus Hindsgaul <claus_h@image.dk>, 2002,2003, 2004, 2005, 2006. +# Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2006, 2007. msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\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" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"PO-Revision-Date: 2007-02-03 15:50+0100\n" +"Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n" +"Language-Team: Danish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.1\n" +"X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: cmdline/apt-cache.cc:135 @@ -153,7 +154,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s oversat p %s %s\n" @@ -427,115 +428,129 @@ msgstr "Ingen valg passede" msgid "Some files are missing in the package file group `%s'" msgstr "Visse filer mangler i pakkefilgruppen '%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB var delagt, filen omdbt til %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB er gammel, forsger at opgradere %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"Databaseformatet er ugyldigt. Hvis du har opgraderet fra en tidligere " +"version af apt, s fjern og genskab databasen." + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kunne ikke bne DB-filen %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Filens dato er ndret %s" +msgid "Failed to stat %s" +msgstr "Kunne ikke finde %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrolindgang" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Kunne skaffe en markr" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Kunne ikke lse mappen %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Kunne ikke finde finde %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "F: Fejlene vedrrer filen " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Kunne ikke omstte navnet %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Trvandring mislykkedes" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Kunne ikke bne %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Kunne ikke 'readlink' %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Kunne ikke frigre %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Kunne ikke lnke %s til %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Nede DeLink-begrnsningen p %sB.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Kunne ikke finde %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Arkivet havde intet package-felt" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen tvangs-post\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " pakkeansvarlig for %s er %s, ikke %s\n" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s har ingen linje med tilsidesttelse af standard for kildefiler\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr "" +" %s har ingen linje med tilsidesttelse af standard for binre filer\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -796,11 +811,11 @@ msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." msgid "Internal error, Ordering didn't finish" msgstr "Intern fejl. Sortering blev ikke fuldfrt" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Kunne ikke lse nedhentningsmappen" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Listen med kilder kunne ikke lses." @@ -829,7 +844,7 @@ msgstr "Efter udpakning vil %sB yderligere diskplads vre brugt.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" @@ -866,7 +881,7 @@ msgstr "Afbryder." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortstte [J/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" @@ -875,7 +890,7 @@ msgstr "Kunne ikke hente %s %s\n" msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand" @@ -1048,107 +1063,107 @@ msgstr "delagte pakker" msgid "The following extra packages will be installed:" msgstr "Flgende yderligere pakker vil blive installeret:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Foreslede pakker:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Anbefalede pakker:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislykkedes" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Frdig" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "Intern fejl. Problemlseren delagde noget" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "Du skal angive mindst n pakke at hente kildeteksten til" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Overspringer allerede hentet fil '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plads i %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst n pakke at tjekke opbygningsafhngigheder for" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhngigheder.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1156,7 +1171,7 @@ msgid "" msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1165,32 +1180,32 @@ msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da ingen af de tilgngelige " "udgaver af pakken %s kan tilfredsstille versions-kravene" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Kunne ikke opfylde %s-afhngigheden for %s: Den installerede pakke %s er for " "ny" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhngighederne" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Understttede moduler:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1374,19 +1389,19 @@ msgstr "Sammenfletter tilgngelighedsoplysninger" msgid "Failed to create pipes" msgstr "Kunne ikke oprette viderefrsler" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Kunne ikke udfre gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "delagt arkiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-tjeksum fejlede, arkivet er delagt" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukendt TAR-hovedtype %u, element %s" @@ -1654,25 +1669,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Forkert cd" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format 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 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disk blev ikke fundet." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fil blev ikke fundet" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Kunne ikke finde" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Kunne ikke angive ndringstidspunkt" @@ -1800,7 +1815,7 @@ msgstr "Tidsudlb p datasokkel-forbindelse" msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" @@ -1884,39 +1899,40 @@ msgstr "Der skete noget underligt under navneomstning af '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "Kunne ikke forbinde til %s %s:" -#: methods/gpgv.cc:64 -#, fuzzy, c-format +#: methods/gpgv.cc:65 +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Kunne ikke omstte navnet '%s'" +msgstr "Kunne ikke tilg ngleringent '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "F: Argumentlisten fra Acquire::gpgv::Options er for lang. Afslutter." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Intern fejl: Gyldig signatur, men kunne ikke afgre ngle-fingeraftryk?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Stdte p mindst n ugyldig signatur." -#: methods/gpgv.cc:207 -#, fuzzy, c-format +#: methods/gpgv.cc:213 +#, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr " for at verificere signaturen (er gnupg installeret?)" +msgstr "" +"Kunne ikke kre '%s' for at verificere signaturen (er gnupg installeret?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Ukendt fejl ved krsel af gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Flgende signaturer var ugyldige:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1924,87 +1940,87 @@ msgstr "" "Flgende signaturer kunne ikke verificeret, da den offentlige ngle ikke er " "tilgngelig:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Kunne ikke bne datarr for %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Lsefejl fra %s-process" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Afventer hoveder" -#: methods/http.cc:522 +#: methods/http.cc:523 #, 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:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Ugyldig linje i hovedet" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "http-serveren sendte et ugyldigt svarhovede" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http-serveren sendte et ugyldigt Content-Length-hovede" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http-serveren sendte et ugyldigt Content-Range-hovede" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "" "Denne http-servere har fejlagtig understttelse af intervaller ('ranges')" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Tidsudlb p forbindelsen" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved lsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Fejl ved lsning fra server" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Intern fejl" @@ -2077,12 +2093,12 @@ msgstr "Syntaksfejl %s:%u: Ikke-understttet direktiv '%s'" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfejl %s:%u: Overskydende affald i slutningen af filen" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Fejl!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Frdig" @@ -2295,12 +2311,12 @@ msgstr "Kandidatversioner" msgid "Dependency generation" msgstr "Afhngighedsgenerering" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kunne ikke tolke pakkefilen %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kunne ikke tolke pakkefilen %s (2)" @@ -2379,7 +2395,7 @@ msgid "" msgstr "" "Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2387,7 +2403,7 @@ msgstr "" "Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes " "tilbageholdte pakker." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Kunne ikke korrigere problemerne, da du har tilbageholdt delagte pakker." @@ -2404,15 +2420,15 @@ msgstr "Arkivmappen %spartial mangler." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:830 +#, 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 +#: apt-pkg/acquire.cc:832 +#, c-format msgid "Retrieving file %li of %li" -msgstr "Lser fillisten" +msgstr "Henter fil %li ud af %li" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2455,16 +2471,16 @@ msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller bnes." msgid "You may want to run apt-get update to correct these problems" msgstr "Du kan muligvis rette problemet ved at kre 'apt-get update'" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Ugyldig indgang i indstillingsfilen. Pakkehovedet mangler" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Kunne ikke forst pin-type %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin" @@ -2554,16 +2570,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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is 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 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2572,7 +2588,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:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2581,13 +2597,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:848 +#: apt-pkg/acquire-item.cc:855 #, 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:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Strrelsen stemmer ikke" @@ -2641,11 +2657,16 @@ msgstr "Skanner disken for indeksfiler..\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Fandt %i pakkeindekser, %i kildeindekser og %i signaturer\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Gemt mrkat: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Det er ikke et gyldigt navn, prv igen.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2654,20 +2675,21 @@ msgstr "" "Denne disk hedder: \n" " %s \n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Kopierer pakkelisterne..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Skriver ny kildeliste\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Denne disk har flgende kildeliste-indgange:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "Afmonterer cdrom..." #: apt-pkg/indexcopy.cc:261 @@ -2731,39 +2753,24 @@ msgid "Removed %s" msgstr "Fjernede %s" #: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#, c-format msgid "Preparing to completely remove %s" -msgstr "Gr klar til at stte %s op" +msgstr "Gr klar til at fjerne %s helt" #: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#, c-format msgid "Completely removed %s" -msgstr "Kunne ikke slette %s" +msgstr "Fjernede %s helt" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Forbindelsen lukkedes for hurtigt" -#: 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/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s har ingen tvangs-post\n" - -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s har ingen tvangs-post\n" +#~ msgid "Could not patch file" +#~ msgstr "Kunne ikke pfre filen %s en lap" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Kunne ikke bne filen %s" +#~ msgid "File date has changed %s" +#~ msgstr "Filens dato er ndret %s" #~ msgid "Reading file list" #~ msgstr "Indlser fillisten" @@ -1,14 +1,14 @@ -# German messages for the apt suite.
-# Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.
-# Michael Piefel <piefel@informatik.hu-berlin.de>, 2001, 2002, 2003, 2004.
-# Rüdiger Kuhlmann <Uebersetzung@ruediger-kuhlmann.de>, 2002.
-#
+# German messages for the apt suite. +# Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. +# Michael Piefel <piefel@informatik.hu-berlin.de>, 2001, 2002, 2003, 2004, 2006. +# Rüdiger Kuhlmann <Uebersetzung@ruediger-kuhlmann.de>, 2002. +# msgid "" msgstr "" -"Project-Id-Version: apt 0.5.26\n" +"Project-Id-Version: apt 0.6.46.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" -"PO-Revision-Date: 2005-06-15 18:22+0200\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"PO-Revision-Date: 2006-10-24 11:45+0200\n" "Last-Translator: Michael Piefel <piefel@debian.org>\n" "Language-Team: <de@li.org>\n" "MIME-Version: 1.0\n" @@ -112,7 +112,7 @@ msgstr "%4i %s\n" #. Show any packages have explicit pins #: cmdline/apt-cache.cc:1482 msgid "Pinned packages:" -msgstr "Festgehaltene Pakete (»Pin«):" +msgstr "Festgehaltene Pakete („Pin“):" #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 msgid "(not found)" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 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" @@ -200,29 +200,29 @@ msgstr "" "APT zu manipulieren und Informationen daraus zu erfragen.\n" "\n" "Befehle:\n" -" add - Paket-Datei dem Quellcache hinzufügen\n" -" gencaches - Paket- und Quellcache neu erzeugen\n" -" showpkg - grundsätzliche Informationen für ein einzelnes Paket zeigen\n" -" showsrc - Aufzeichnungen zu Quellen zeigen\n" -" stats - einige grundlegenden Statistiken zeigen\n" -" dump - gesamte Datei in Kurzform zeigen\n" -" dumpavail - gesamte Datei verfügbarer Pakete ausgeben\n" -" unmet - unerfüllte Abhängigkeiten zeigen\n" -" search - in der Paketliste mittels regulären Ausdrucks suchen\n" -" show - einen lesbaren Datensatz für das Paket zeigen\n" -" depends - normale Abhängigkeitsinformationen für ein Paket zeigen\n" -" rdepends - umgekehrte Abhängigkeitsinformationen für ein Paket zeigen\n" -" pkgnames - alle Paketnamen auflisten\n" -" dotty - einen Paketgraph zur Verwendung mit GraphViz erzeugen\n" -" xvcg - einen Paketgraph zur Verwendung mit xvcg erzeugen\n" -" policy - »policy«-Einstellungen zeigen\n" +" add – Paket-Datei dem Quellcache hinzufügen\n" +" gencaches – Paket- und Quellcache neu erzeugen\n" +" showpkg – grundsätzliche Informationen für ein einzelnes Paket zeigen\n" +" showsrc – Aufzeichnungen zu Quellen zeigen\n" +" stats – einige grundlegenden Statistiken zeigen\n" +" dump – gesamte Datei in Kurzform zeigen\n" +" dumpavail – gesamte Datei verfügbarer Pakete ausgeben\n" +" unmet – unerfüllte Abhängigkeiten zeigen\n" +" search – in der Paketliste mittels regulären Ausdrucks suchen\n" +" show – einen lesbaren Datensatz für das Paket zeigen\n" +" depends – normale Abhängigkeitsinformationen für ein Paket zeigen\n" +" rdepends – umgekehrte Abhängigkeitsinformationen für ein Paket zeigen\n" +" pkgnames – alle Paketnamen auflisten\n" +" dotty – einen Paketgraph zur Verwendung mit GraphViz erzeugen\n" +" xvcg – einen Paketgraph zur Verwendung mit xvcg erzeugen\n" +" policy – „policy“-Einstellungen zeigen\n" "\n" "Optionen:\n" " -h dieser Hilfe-Text.\n" " -p=? der Paketcache.\n" " -s=? der Quellcache.\n" " -q Fortschrittsanzeige abschalten\n" -" -i nur wichtige Abhängigkeiten für den »unmet«-Befehl zeigen\n" +" -i nur wichtige Abhängigkeiten für den „unmet“-Befehl zeigen\n" " -c=? diese Konfigurationsdatei lesen\n" " -o=? eine beliebige Konfigurations-Option setzen, z. B. -o dir::cache=/" "tmp\n" @@ -231,8 +231,8 @@ msgstr "" #: 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«" +"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" @@ -241,7 +241,8 @@ msgstr "" #: 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." +msgstr "" +"Wiederholen Sie dieses Prozedere für die restlichen CDs in Ihres Satzes." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" @@ -268,8 +269,8 @@ msgstr "" "lesen.\n" "\n" "Befehle:\n" -" shell - Shell-Modus\n" -" dump - Die Konfiguration ausgeben\n" +" shell – Shell-Modus\n" +" dump – Die Konfiguration ausgeben\n" "\n" "Optionen:\n" " -h Dieser Hilfetext\n" @@ -342,7 +343,6 @@ msgid "Error processing contents %s" msgstr "Fehler beim Verarbeiten der Inhaltsdatei %s" #: ftparchive/apt-ftparchive.cc:556 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -398,7 +398,7 @@ msgstr "" "\n" "apt-ftparchive generiert Package-Dateien aus einem Baum von .debs. Die " "Package-\n" -"Datei enthält die Inhalt aller Kontrollfelder aus jedem Paket sowie einen " +"Datei enthält den Inhalt aller Kontrollfelder aus jedem Paket sowie einen " "MD5-\n" "Hashwert und die Dateigröße. Eine Override-Datei wird unterstützt, um Werte " "für\n" @@ -410,7 +410,7 @@ msgstr "" "Override-\n" "Datei für Quellen anzugeben.\n" "\n" -"Die Befehle »packages« und »source« sollten in der Wurzel des Baumes " +"Die Befehle „packages“ und „source“ sollten in der Wurzel des Baumes " "aufgerufen\n" "werden. BinaryPath sollte auf die Basis der rekursiven Suche zeigen und\n" "overridefile sollte die Override-Flags enthalten. Pfadpräfix wird, so\n" @@ -419,15 +419,15 @@ msgstr "" " dists/potato/main/binary-i386/Packages\n" "\n" "Optionen:\n" -" -h Dieser Hilfe-Text.\n" -" --md5 Steuere MD5-Generierung\n" -" -s=? Override-Datei für Quellen ein\n" -" -q Ruhig\n" -" -d=? Optionale Cache-Datenbank auswählen\n" +" -h dieser Hilfe-Text\n" +" --md5 MD5-Hashes erzeugen\n" +" -s=? Override-Datei für Quellen\n" +" -q ruhig\n" +" -d=? optionale Cache-Datenbank auswählen\n" " --no-delink Debug-Modus für Delinking setzen\n" -" --contents Steuere Inhaltsdatei-Generierung\n" -" -c=? Lese diese Konfigurationsdatei\n" -" -o=? Setze eine beliebige Konfigurations-Option" +" --contents Inhaltsdatei erzeugen\n" +" -c=? diese Konfigurationsdatei lesen\n" +" -o=? eine beliebige Konfigurations-Option setzen" #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" @@ -436,117 +436,130 @@ msgstr "Keine Auswahl passt" #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«" +msgstr "Einige Dateien fehlen in der Paketdateigruppe „%s“" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB wurde beschädigt, Datei umbenannt in %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB ist alt, versuche %s zu erneuern" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"DB-Format ist ungültig. Wenn Sie ein Update von einer älteren Version von " +"apt gemacht haben, entfernen Sie bitte die Datenbank und erstellen sie neu." + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kann DB-Datei %s nicht öffnen: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Dateidatum hat sich geändert %s" +msgid "Failed to stat %s" +msgstr "Kann auf %s nicht zugreifen." -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" -msgstr "Archiv ist keinen Steuerungs-Datensatz" +msgstr "Archiv hat keinen Steuerungs-Datensatz" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Kann keinen Cursor bekommen" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Kann Verzeichnis %s nicht lesen\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Kann nicht zugreifen auf %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "F: Fehler gehören zu Datei " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Konnte %s nicht auflösen" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Baumabschreiten fehlgeschlagen" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Konnte %s nicht öffnen" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Kann kein readlink auf %s durchführen" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" -msgstr "Konnte %s entfernen (unlink)" +msgstr "Konnte %s nicht entfernen (unlink)" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Konnte keine Verknüpfung von %s zu %s anlegen" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-Limit von %sB erreicht.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Kann auf %s nicht zugreifen." - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Archiv hatte kein Paket-Feld" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s hat keinen Eintrag in der Override-Liste.\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-Maintainer ist %s und nicht %s\n" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -554,7 +567,7 @@ msgstr "Interner Fehler, konnte Bestandteil %s nicht finden" #: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" -msgstr "realloc - Speicheranforderung fehlgeschlagen" +msgstr "realloc – Speicheranforderung fehlgeschlagen" #: ftparchive/override.cc:38 ftparchive/override.cc:146 #, c-format @@ -574,7 +587,7 @@ msgstr "Missgestaltetes Override %s Zeile %lu #2" #: ftparchive/override.cc:92 ftparchive/override.cc:195 #, c-format msgid "Malformed override %s line %lu #3" -msgstr "Missgestaltetes Override %s Zeile %lu #2" +msgstr "Missgestaltetes Override %s Zeile %lu #3" #: ftparchive/override.cc:131 ftparchive/override.cc:205 #, c-format @@ -584,7 +597,7 @@ msgstr "Konnte die Override-Datei %s nicht lesen." #: ftparchive/multicompress.cc:75 #, c-format msgid "Unknown compression algorithm '%s'" -msgstr "Unbekannter Komprimierungsalgorithmus »%s«" +msgstr "Unbekannter Komprimierungsalgorithmus „%s“" #: ftparchive/multicompress.cc:105 #, c-format @@ -649,7 +662,7 @@ msgstr "J" #: 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" +msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s" #: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" @@ -715,7 +728,6 @@ msgid "%s (due to %s) " msgstr "%s (wegen %s) " #: cmdline/apt-get.cc:546 -#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -770,9 +782,7 @@ msgstr " Fertig" #: 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." +msgstr "Probieren Sie „apt-get -f install“, um diese zu korrigieren." #: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." @@ -784,7 +794,7 @@ msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!" #: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Authentifizierungswarnung überstimmt.\n" #: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " @@ -810,11 +820,11 @@ msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." msgid "Internal error, Ordering didn't finish" msgstr "Interner Fehler, Anordnung beendete nicht" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Kann kein Lock für das Downloadverzeichnis erhalten." -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Die Liste der Quellen konnte nicht gelesen werden." @@ -845,7 +855,7 @@ msgstr "Nach dem Auspacken werden %sB Plattenplatz zusätzlich benutzt.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben worden sein.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "Konnte freien Platz in %s nicht bestimmen" @@ -857,21 +867,21 @@ msgstr "Sie haben nicht genug Platz in %s." #: 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." +msgstr "„Nur triviale“ angegeben, aber das ist keine triviale Operation." #: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Ja, tu was ich sage!" #: cmdline/apt-get.cc:868 -#, fuzzy, c-format +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" "Sie sind im Begriff, etwas potenziell Schädliches zu tun.\n" -"Zum Fortfahren geben Sie bitte »%s« ein.\n" +"Zum Fortfahren geben Sie bitte „%s“ ein.\n" " ?] " #: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 @@ -882,7 +892,7 @@ msgstr "Abbruch." msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Konnte %s nicht holen %s\n" @@ -891,7 +901,7 @@ msgstr "Konnte %s nicht holen %s\n" msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus" @@ -900,8 +910,8 @@ msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Konnte einige Archive nicht herunterladen, vielleicht »apt-get update« oder " -"mit »--fix-missing« probieren?" +"Konnte einige Archive nicht herunterladen, vielleicht „apt-get update“ oder " +"mit „--fix-missing“ probieren?" #: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" @@ -924,7 +934,7 @@ msgstr "Achtung, wähle %s an Stelle von %s\n" #, 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" +"Überspringe %s, es ist schon installiert und „upgrade“ ist nicht gesetzt.\n" #: cmdline/apt-get.cc:1058 #, c-format @@ -934,7 +944,7 @@ msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt\n" #: 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" +msgstr "Paket %s ist ein virtuelles Paket, das bereitgestellt wird von:\n" #: cmdline/apt-get.cc:1081 msgid " [Installed]" @@ -979,12 +989,12 @@ msgstr "%s ist schon die neueste Version.\n" #: 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" +msgstr "Release „%s“ für „%s“ konnte nicht gefunden werden" #: 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" +msgstr "Version „%s“ für „%s“ konnte nicht gefunden werden" #: cmdline/apt-get.cc:1176 #, c-format @@ -993,7 +1003,7 @@ msgstr "Gewählte Version %s (%s) für %s\n" #: cmdline/apt-get.cc:1313 msgid "The update command takes no arguments" -msgstr "Der Befehl »update« nimmt keine Argumente" +msgstr "Der Befehl „update“ nimmt keine Argumente" #: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" @@ -1019,20 +1029,18 @@ msgstr "Konnte Paket %s nicht finden" #: 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" +msgstr "Achtung, wähle %s für reg. Ausdruck „%s“\n" #: 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:" +msgstr "Probieren Sie „apt-get -f install“, um diese zu korrigieren:" #: cmdline/apt-get.cc:1549 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Nichterfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne " +"Nichterfüllte Abhängigkeiten. Versuchen Sie „apt-get -f install“ ohne " "jeglich Pakete (oder geben Sie eine Lösung an)." #: cmdline/apt-get.cc:1561 @@ -1044,7 +1052,7 @@ msgid "" msgstr "" "Einige Pakete konnten nicht installiert werden. Das kann bedeuten, dass\n" "Sie eine unmögliche Situation angefordert haben oder dass, wenn Sie die\n" -"instabile Distribution verwenden, einige erforderliche Pakete noch nicht\n" +"Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n" "kreiert oder aus Incoming herausbewegt wurden." #: cmdline/apt-get.cc:1569 @@ -1053,7 +1061,7 @@ msgid "" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -"Da Sie nur eine einzige Operation angefordert haben ist es sehr " +"Da Sie nur eine einzige Operation angefordert haben, ist es sehr " "wahrscheinlich,\n" "dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n" "dieses Paket erfolgen sollte." @@ -1071,111 +1079,111 @@ msgstr "Kaputte Pakete" msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Berechne Upgrade..." -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Fehlgeschlagen" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Fertig" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "" -"Es muss mindesten ein Paket angegeben werden, dessen Quellen geholt werden " +"Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden " "sollen" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Kann Quellpaket für %s nicht finden" -#: cmdline/apt-get.cc:1950 -#, fuzzy, c-format +#: cmdline/apt-get.cc:1968 +#, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n" +msgstr "Überspringe schon heruntergeladene Datei „%s“\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genug freien Platz in %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es müssen noch %sB/%sB der Quellarchive geholt werden.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es müssen %sB der Quellarchive geholt werden.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Hole Quelle %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Konnte einige Archive nicht holen." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n" +msgstr "Entpack-Befehl „%s“ fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Überprüfen Sie, ob das Paket „dpkg-dev“ installiert ist.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" -msgstr "Build-Befehl »%s« fehlgeschlagen.\n" +msgstr "Build-Befehl „%s“ fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss zumindest ein Paket angegeben werden, dessen Build-Dependencies\n" "überprüft werden sollen." -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Information zu Build-Dependencies für %s konnte nicht gefunden werden." -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Build-Dependencies.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1184,7 +1192,7 @@ msgstr "" "%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht " "gefunden werden kann." -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1193,32 +1201,32 @@ msgstr "" "%s Abhängigkeit für %s kann nicht befriedigt werden, da keine verfügbare " "Version von Paket %s die Versionsanforderungen erfüllen kann." -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Konnte die %s-Abhängigkeit für %s nicht erfüllen: Installiertes Paket %s ist " "zu neu." -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Konnte die %s-Abhängigkeit für %s nicht erfüllen: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Build-Abhängigkeit für %s konnte nicht erfüllt werden." +msgstr "Build-Abhängigkeiten für %s konnten nicht erfüllt werden." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" -msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen" +msgstr "Verarbeitung der Build-Abhängigkeiten fehlgeschlagen" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1268,35 +1276,36 @@ msgstr "" "sind update und install.\n" "\n" "Befehle:\n" -" update - neue Liste von Paketen einlesen\n" -" upgrade - ein Upgrade durchführen\n" -" install - neue Pakete installieren (pkg ist libc6 und nicht libc6." +" update – neue Liste von Paketen einlesen\n" +" upgrade – eine Paketaktualisierung durchführen\n" +" install – neue Pakete installieren (pkg ist libc6 und nicht libc6." "deb)\n" -" remove - Pakete entfernen\n" -" source - Quellarchive herunterladen\n" -" build-dep - die »Build-Dependencies« für Quellpakete konfigurieren\n" -" dist-upgrade - »Distribution upgrade«, siehe apt-get(8)\n" -" dselect-upgrade - der Auswahl aus »dselect« folgen\n" -" clean - heruntergeladene Archive löschen\n" -" autoclean - veraltete heruntergeladene Archive löschen\n" -" check - überprüfen, dass es keine nicht erfüllten Abhängigkeiten " +" remove – Pakete entfernen\n" +" source – Quellarchive herunterladen\n" +" build-dep – die Build-Abhängigkeiten für Quellpakete konfigurieren\n" +" dist-upgrade – „Distribution upgrade“, siehe apt-get(8)\n" +" dselect-upgrade – der Auswahl aus „dselect“ folgen\n" +" clean – heruntergeladene Archive löschen\n" +" autoclean – veraltete heruntergeladene Archive löschen\n" +" check – überprüfen, dass es keine nicht erfüllten Abhängigkeiten " "gibt\n" "\n" "Optionen:\n" " -h dieser Hilfetext\n" -" -q protokollierbare (logbare) Ausgabe - kein Fortschrittsindikator\n" +" -q protokollierbare (logbare) Ausgabe – keine Fortschrittsanzeige\n" " -qq keine Ausgabe außer bei Fehlern\n" -" -d nur herunterladen - Archive NICHT installieren oder entpacken\n" +" -d nur herunterladen – Archive NICHT installieren oder entpacken\n" " -s nichts tun; nur eine Simulation der Vorgänge durchführen\n" -" -y für alle Antworten »Ja« annehmen und nicht nachfragen\n" -" -f versuchen fortzufahren, wenn dir Integritätsüberprüfung fehlschlägt\n" +" -y für alle Antworten „Ja“ annehmen und nicht nachfragen\n" +" -f versuchen fortzufahren, wenn die Integritätsüberprüfung fehlschlägt\n" " -m versuchen fortzufahren, wenn Archive nicht auffindbar sind\n" " -u auch eine Liste der aktualisierten Pakete mit anzeigen\n" " -b ein Quellpaket nach dem Herunterladen übersetzen\n" " -V ausführliche Versionsnummern anzeigen\n" " -c=? Diese Konfigurationsdatei benutzen\n" " -o=? Beliebige Konfigurationsoptionen setzen, z. B. -o dir::cache=/tmp\n" -"Siehe auch die Man-Seiten apt-get(8), sources.list(5) und apt.conf(5) für\n" +"Siehe auch die Handbuch-Seiten apt-get(8), sources.list(5) und apt.conf(5) " +"für\n" "weitergehende Informationen und Optionen.\n" " Dieses APT hat Super-Kuh-Kräfte.\n" @@ -1333,13 +1342,13 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" -"Medienwechsel: Bitte legen Sie Medium mit den Name\n" -" »%s«\n" -"in Laufwerk »%s« und drücken Sie die Eingabetaste.\n" +"Medienwechsel: Bitte legen Sie das Medium mit dem Namen\n" +" „%s“\n" +"in Laufwerk „%s“ und drücken Sie die Eingabetaste.\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" -msgstr "Unbekannter Paketeintrag" +msgstr "Unbekannter Paketeintrag!" #: cmdline/apt-sortpkgs.cc:150 msgid "" @@ -1406,19 +1415,19 @@ msgstr "Führe Information zur Verfügbarkeit zusammen" msgid "Failed to create pipes" msgstr "Konnte Weiterleitungen nicht erzeugen" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Konnte gzip nicht ausführen" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Korrumpiertes Archiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv korrumpiert" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Unbekannter Tar-Kopf-Typ %u, Bestandteil %s" @@ -1433,7 +1442,7 @@ msgstr "Fehler beim Lesen der Archivdateienkopfzeilen" #: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 msgid "Invalid archive member header" -msgstr "Ungültige Archivdateienkopfzeile" +msgstr "Ungültige Archivdateikopfzeile" #: apt-inst/contrib/arfile.cc:131 msgid "Archive is too short" @@ -1441,11 +1450,11 @@ msgstr "Archiv ist zu kurz" #: apt-inst/contrib/arfile.cc:135 msgid "Failed to read the archive headers" -msgstr "Konnte Archiveköpfe nicht lesen." +msgstr "Konnte Archivköpfe nicht lesen." #: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" -msgstr "»DropNode« auf noch verlinktem Knoten aufgerufen" +msgstr "„DropNode“ auf noch verlinktem Knoten aufgerufen" #: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" @@ -1457,7 +1466,7 @@ msgstr "Konnte Umleitung nicht reservieren" #: apt-inst/filelist.cc:468 msgid "Internal error in AddDiversion" -msgstr "Interner Fehler in »AddDiversion«" +msgstr "Interner Fehler in „AddDiversion“" #: apt-inst/filelist.cc:481 #, c-format @@ -1475,9 +1484,9 @@ msgid "Duplicate conf file %s/%s" msgstr "Doppelte Konfigurationsdatei %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" -msgstr "Konnte nicht in Datei %s schreiben" +msgstr "Konnte Datei %s nicht schreiben" #: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format @@ -1561,7 +1570,7 @@ msgstr "Kann nicht auf %sinfo zugreifen" #: apt-inst/deb/dpkgdb.cc:123 msgid "The info and temp directories need to be on the same filesystem" msgstr "" -"Die »info«- und »temp«-Verzeichnisse müssen im selben Dateisystem liegen" +"Die „info“- und „temp“-Verzeichnisse müssen im selben Dateisystem liegen" #. Build the status cache #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 @@ -1580,7 +1589,6 @@ msgstr "Kann nicht ins Administrationsverzeichnis %sinfo wechseln" 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:386 msgid "Reading file listing" msgstr "Paketlisten werden gelesen" @@ -1592,14 +1600,14 @@ msgid "" "then make it empty and immediately re-install the same version of the " "package!" msgstr "" -"Fehler beim Öffnen der Listendatei »%sinfo/%s«. Wenn Sie diese Datei nicht " +"Fehler beim Öffnen der Listendatei „%sinfo/%s“. Wenn Sie diese Datei nicht " "wiederherstellen können, dann leeren Sie sie und installieren Sie sofort " "dieselbe Version des Paketes erneut!" #: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Fehler beim Lesen der Listendatei »%sinfo/%s«." +msgstr "Fehler beim Lesen der Listendatei „%sinfo/%s“." #: apt-inst/deb/dpkgdb.cc:266 msgid "Internal error getting a node" @@ -1631,12 +1639,12 @@ msgstr "Der Paketcache muss erst initialisiert werden" #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Konnte keine »Package:«-Kopfzeile finden, Abstand %lu" +msgstr "Konnte keine „Package:“-Kopfzeile finden, Abstand %lu" #: apt-inst/deb/dpkgdb.cc:465 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "Fehlerhafter »ConfFile«-Abschnitt in der Statusdatei, Abstand %lu" +msgstr "Fehlerhafter „ConfFile“-Abschnitt in der Statusdatei, Abstand %lu" #: apt-inst/deb/dpkgdb.cc:470 #, c-format @@ -1646,12 +1654,12 @@ msgstr "Fehler beim Parsen der MD5-Summe. Abstand %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 "Dies ist kein gültiges DEB-Archiv, da es »%s« nicht enthält" +msgstr "Dies ist kein gültiges DEB-Archiv, da es „%s“ nicht enthält" #: apt-inst/deb/debfile.cc:52 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Dies ist kein gültiges DEB-Archiv, da es weder »%s« noch »%s« enthält" +msgstr "Dies ist kein gültiges DEB-Archiv, da es weder „%s“ noch „%s“ enthält" #: apt-inst/deb/debfile.cc:112 #, c-format @@ -1680,36 +1688,35 @@ 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 "" -"Bitte verwenden Sie apt-cdrom, um diese CD von APT erkennbar zu machen - apt-" +"Bitte verwenden Sie apt-cdrom, um diese CD von APT erkennbar zu machen. apt-" "get update kann nicht dazu verwendet werden, neue CDs hinzuzufügen" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" msgstr "Falsche CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Kann Einbindung von CD-ROM in %s nicht lösen, möglicherweise wird sie noch " "verwendet." -#: methods/cdrom.cc:169 -#, fuzzy +#: methods/cdrom.cc:171 msgid "Disk not found." -msgstr "Datei nicht gefunden" +msgstr "Disk nicht gefunden." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Datei nicht gefunden" -# looks like someone hardcoded English grammar
-#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +# looks like someone hardcoded English grammar +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Kann nicht zugreifen." -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Kann Änderungszeitpunkt nicht setzen" @@ -1750,13 +1757,13 @@ msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -"Es war ein Proxy-Server angegeben, aber kein Einlogg-Skript - Acquire::ftp::" +"Es war ein Proxy-Server angegeben, aber kein Einlogg-Skript, Acquire::ftp::" "ProxyLogin ist leer." #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Befehl »%s« des Einlogg-Skriptes ist fehlgeschlagen: %s" +msgstr "Befehl „%s“ des Einlogg-Skriptes ist fehlgeschlagen: %s" #: methods/ftp.cc:291 #, c-format @@ -1838,14 +1845,14 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung" msgid "Unable to accept connection" msgstr "Kann Verbindung nicht annehmen" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Kann Datei nicht holen, Server antwortete »%s«" +msgstr "Kann Datei nicht holen, Server antwortete „%s“" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" @@ -1854,7 +1861,7 @@ msgstr "Datenverbindung erlitt Zeitüberschreitung" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Datenübertragung fehlgeschlagen, Server antwortete »%s«" +msgstr "Datenübertragung fehlgeschlagen, Server antwortete „%s“" #. Get the files information #: methods/ftp.cc:997 @@ -1906,143 +1913,149 @@ msgstr "Verbinde mit %s" #: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" -msgstr "Konnte »%s« nicht auflösen" +msgstr "Konnte „%s“ nicht auflösen" #: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "Temporärer Fehlschlag beim Auflösen von »%s«" +msgstr "Temporärer Fehlschlag beim Auflösen von „%s“" #: 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)" +msgstr "Beim Auflösen von „%s:%s“ ist etwas Schlimmes passiert (%i)" #: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Kann nicht mit %s:%s verbinden:" -#: methods/gpgv.cc:64 -#, fuzzy, c-format +#: methods/gpgv.cc:65 +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Konnte »%s« nicht auflösen" +msgstr "Konnte nicht auf Schlüsselring zugreifen: „%s“" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" +msgstr "E: Argumentliste von Acquire::gpgv::Options zu lang. Breche ab." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" +"Interner Fehler: Gültige Signatur, aber konnte den Fingerabdruck des " +"Schlüssels nicht ermitteln?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "Mindestens eine ungültige Signatur wurde entdeckt." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" +"Konnte „%s“ zum Überprüfen der Signatur nicht ausführen (ist gnupg " +"installiert?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Unbekannter Fehler beim Ausführen von gpgv" -#: methods/gpgv.cc:243 -#, fuzzy +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" -msgstr "Die folgenden zusätzlichen Pakete werden installiert:" +msgstr "Die folgenden Signaturen waren ungültig:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"Die folgenden Signaturen konnten nicht überprüft werden, weil ihr " +"öffentlicher\n" +"Schlüssel nicht verfügbar ist:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Konnte keine Pipe für %s öffnen" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Lesefehler von Prozess %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Warte auf Kopfzeilen (header)" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Schlechte Kopfzeile" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Der http-Server sandte eine ungültige Antwort-Kopfzeile" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Der http-Server sandte eine ungültige »Content-Length«-Kopfzeile" +msgstr "Der http-Server sandte eine ungültige „Content-Length“-Kopfzeile" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Der http-Server sandte eine ungültige »Content-Range«-Kopfzeile" +msgstr "Der http-Server sandte eine ungültige „Content-Range“-Kopfzeile" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft." -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Verbindung erlitt Zeitüberschreitung" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Fehler beim Schreiben einer Ausgabedatei" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Fehler beim Schreiben einer Datei" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:874 +#: methods/http.cc:875 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:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Interner Fehler" @@ -2063,7 +2076,7 @@ msgstr "Auswahl %s nicht gefunden" #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Nicht erkannte Typabkürzung: »%c«" +msgstr "Nicht erkannte Typabkürzung: „%c“" #: apt-pkg/contrib/configuration.cc:494 #, c-format @@ -2109,19 +2122,19 @@ msgstr "Syntaxfehler %s:%u: Einbindung von here" #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive »%s«" +msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive „%s“" #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll am Dateiende" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Fehler!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fertig" @@ -2129,7 +2142,7 @@ msgstr "%c%s... Fertig" #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "Kommandozeilenoption »%c« [aus %s] ist nicht bekannt." +msgstr "Kommandozeilenoption „%c“ [aus %s] ist nicht bekannt." #: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 #: apt-pkg/contrib/cmndline.cc:122 @@ -2155,17 +2168,18 @@ msgstr "Option %s: Konfigurationswertspezifikation muss einen =<wert> haben." #: apt-pkg/contrib/cmndline.cc:237 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht »%s«" +msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht „%s“" #: apt-pkg/contrib/cmndline.cc:268 #, c-format msgid "Option '%s' is too long" -msgstr "Option »%s« ist zu lang" +msgstr "Option „%s“ ist zu lang" +# Check for boolean; -1 is unspecified, 0 is yes 1 is no #: apt-pkg/contrib/cmndline.cc:301 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "Sense %s wird nicht verstanden, versuchen Sie »true« oder »false«." +msgstr "Der Sinn von „%s“ ist nicht klar, versuchen Sie „true“ oder „false“." #: apt-pkg/contrib/cmndline.cc:351 #, c-format @@ -2247,7 +2261,7 @@ msgstr "Beim Schließen der Datei trat ein Problem auf" #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" -msgstr "Beim Unlinking Datei trat ein Problem auf" +msgstr "Beim Unlinking der Datei trat ein Problem auf" #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" @@ -2263,12 +2277,12 @@ msgstr "Die Paketcachedatei ist korrumpiert" #: apt-pkg/pkgcache.cc:137 msgid "The package cache file is an incompatible version" -msgstr "Die Paketcachedatei ist in einer inkompatiblen Version" +msgstr "Die Paketcachedatei liegt in einer inkompatiblen Version vor" #: apt-pkg/pkgcache.cc:142 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "Dieses APT unterstützt das Versionssystem »%s« nicht" +msgstr "Dieses APT unterstützt das Versionssystem „%s“ nicht" #: apt-pkg/pkgcache.cc:147 msgid "The package cache was built for a different architecture" @@ -2334,12 +2348,12 @@ msgstr "Mögliche Versionen" msgid "Dependency generation" msgstr "Abhängigkeits-Generierung" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kann Paketdatei %s nicht parsen (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kann Paketdatei %s nicht parsen (2)" @@ -2347,27 +2361,27 @@ msgstr "Kann Paketdatei %s nicht parsen (2)" #: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s („URI“)" #: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s („dist“)" #: 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«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s („URI parse“)" #: 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«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s („absolute dist“)" #: 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«)" +msgstr "Missgestaltete Zeile %lu in Quellliste %s („dist parse“)" #: apt-pkg/sourcelist.cc:203 #, c-format @@ -2382,17 +2396,17 @@ msgstr "Zeile %u zu lang in der Quellliste %s." #: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" +msgstr "Missgestaltete Zeile %u in Quellliste %s („type“)" #: apt-pkg/sourcelist.cc:244 -#, fuzzy, c-format +#, 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" +msgstr "Typ „%s“ ist unbekannt in Zeile %u der Quellliste %s" #: 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«)" +msgstr "Missgestaltete Zeile %u in Quellliste %s („vendor id“)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2409,7 +2423,7 @@ msgstr "" #: apt-pkg/pkgrecords.cc:37 #, c-format msgid "Index file type '%s' is not supported" -msgstr "Indexdateityp »%s« wird nicht unterstützt" +msgstr "Indexdateityp „%s“ wird nicht unterstützt" #: apt-pkg/algorithms.cc:241 #, c-format @@ -2419,7 +2433,7 @@ msgstr "" "Das Paket %s muss reinstalliert werden, ich kann aber kein Archiv dafür " "finden." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2427,7 +2441,7 @@ msgstr "" "Fehler: pkgProblemResolver::Resolve hat Unterbrechungen hervorgerufen, dies " "könnte durch gehaltene Pakete hervorgerufen worden sein." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "Kann Probleme nicht korrigieren, Sie haben gehaltene kaputte Pakete." @@ -2443,16 +2457,15 @@ msgstr "Archivverzeichnis %spartial fehlt." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "" +msgstr "Hole Datei %li von %li (noch %s)" -#
-#: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:832 +#, c-format msgid "Retrieving file %li of %li" -msgstr "Paketlisten werden gelesen" +msgstr "Hole Datei %li von %li" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2465,17 +2478,16 @@ msgid "Method %s did not start correctly" msgstr "Methode %s hat nicht korrekt gestartet" #: 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 "" -"Medienwechsel: Bitte legen Sie Medium mit den Name\n" -" »%s«\n" -"in Laufwerk »%s« und drücken Sie die Eingabetaste.\n" +"Bitte legen Sie das Medium mit dem Namen „%s“ in Laufwerk „%s“ und drücken " +"Sie die Eingabetaste." #: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "Paketierungssystem »%s« wird nicht unterstützt" +msgstr "Paketierungssystem „%s“ wird nicht unterstützt" #: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" @@ -2489,7 +2501,7 @@ msgstr "Kann nicht auf %s zugreifen." #: apt-pkg/srcrecords.cc:48 msgid "You must put some 'source' URIs in your sources.list" msgstr "" -"Sie müssen einige »source«-URIs für Quellen in die sources.list-Datei " +"Sie müssen einige „source“-URIs für Quellen in die sources.list-Datei " "schreiben." #: apt-pkg/cachefile.cc:73 @@ -2500,19 +2512,18 @@ msgstr "" #: apt-pkg/cachefile.cc:77 msgid "You may want to run apt-get update to correct these problems" -msgstr "" -"Sie möchten vielleicht »apt-get update« aufrufen, um diese Probleme zu lösen" +msgstr "Probieren Sie „apt-get update“, um diese Probleme zu korrigieren." -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" -msgstr "Ungültiger Eintrag in Einstellungs-Datei, kein »Package«-Header" +msgstr "Ungültiger Eintrag in Einstellungs-Datei, kein „Package“-Header" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" -msgstr "Konnte Stecknadeltyp (»pin type«) %s nicht verstehen" +msgstr "Konnte Stecknadeltyp („pin type“) %s nicht verstehen" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Keine Priorität (oder Null) für Pin angegeben" @@ -2606,15 +2617,16 @@ 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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "MD5-Summe stimmt nicht" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "" +"Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2623,7 +2635,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:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2632,14 +2644,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:848 +#: apt-pkg/acquire-item.cc:855 #, 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:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Größe stimmt nicht" @@ -2655,7 +2667,7 @@ msgid "" "Mounting CD-ROM\n" msgstr "" "Benutze CD-ROM-Einhängpunkt %s\n" -"Hänge CD ein\n" +"Hänge CD-ROM ein\n" #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " @@ -2693,33 +2705,39 @@ msgstr "Suche auf CD nach Index-Dateien...\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Fand %i Paketindexe, %i Quellenindexe und %i Signaturen\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Gespeicherte Kennzeichnung: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Dies ist kein gültiger Name, versuchen Sie es erneut.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -"Diese CD heißt jetzt: \n" -"»%s«\n" +"Diese CD heißt: \n" +"„%s“\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Kopiere Paketlisten..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Schreibe neue Quellliste\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Quelllisteneinträge für diese CD sind:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "Hänge CD-ROM aus..." #: apt-pkg/indexcopy.cc:261 @@ -2745,327 +2763,55 @@ msgstr "" "geschrieben.\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "%s wird geöffnet" +msgstr "%s wird vorbereitet" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "%s wird geöffnet" +msgstr "%s wird entpackt" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "Öffne Konfigurationsdatei %s" +msgstr "Konfiguration von %s wird vorbereitet" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "Verbinde mit %s" +msgstr "Konfiguriere %s" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Installiert:" +msgstr "%s installiert" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "Entfernen von %s wird vorbereitet" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "%s wird geöffnet" +msgstr "%s wird entfernt" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Empfiehlt" +msgstr "%s entfernt" #: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#, c-format msgid "Preparing to completely remove %s" -msgstr "Öffne Konfigurationsdatei %s" +msgstr "Komplettes Entfernen von %s wird vorbereitet" #: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#, c-format msgid "Completely removed %s" -msgstr "Konnte %s nicht entfernen" +msgstr "%s komplett entfernt" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Verbindung zu früh beendet" - -#: 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/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s hat keinen Eintrag in der Override-Liste.\n" - -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s hat keinen Eintrag in der Override-Liste.\n" - -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Konnte Datei %s nicht öffnen" - -#~ 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" - -#~ 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 "" -#~ "Einige kaputte Pakete wurden gefunden, während die Build-Dependencies " -#~ "ver-\n" -#~ "arbeitet wurden. Sie möchten wahrscheinlich »apt-get -f install« " -#~ "aufrufen,\n" -#~ "um die Probleme zu beheben." - -#~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs." -#~ msgstr "" -#~ "Tut mir leid, Sie haben nicht genug freien Speicher in %s, um alle .debs " -#~ "zu halten." - -#~ msgid "<- '" -#~ msgstr "<- »" - -#~ msgid "'" -#~ msgstr "«" - -#~ msgid "-> '" -#~ msgstr "-> »" - -#~ msgid "Followed conf file from " -#~ msgstr "Folge Konfigurationsdatei von " - -#~ msgid " to " -#~ msgstr " nach " - -#
-#~ msgid "Extract " -#~ msgstr "Extrahiert " - -#~ msgid "Aborted, backing out" -#~ msgstr "Abgebrochen, nehme Änderungen zurück" - -#~ msgid "De-replaced " -#~ msgstr "Zurück-ersetzt " - -#~ msgid " from " -#~ msgstr " von " - -#~ msgid "Backing out " -#~ msgstr "Nehme Änderung zurück " - -#~ msgid " [new node]" -#~ msgstr " [neuer Knoten]" - -#~ msgid "Replaced file " -#~ msgstr "Ersetzte Datei " - -#~ msgid "Internal error, Unable to parse a package record" -#~ msgstr "Interner Fehler, konnte Paket-Daten nicht parsen" - -#~ msgid "Unimplemented" -#~ msgstr "Nicht implementiert" - -#~ msgid "You must give at least one file name" -#~ msgstr "Sie müssen zumindest einen Dateinamen angeben" - -#~ msgid "Generating cache" -#~ msgstr "Erzeuge Cache" - -#~ msgid "Problem with SelectFile" -#~ msgstr "Problem mit »SelectFile«" - -#~ msgid "Problem with MergeList" -#~ msgstr "Problem mit »MergeList«" - -#~ msgid "Regex compilation error" -#~ msgstr "Fehler beim Kompilieren eines regulären Ausdrucks" - -#~ msgid "Write to stdout failed" -#~ msgstr "Schreiben auf die Standardausgabe fehlgeschlagen" - -#~ msgid "Generate must be enabled for this function" -#~ msgstr "Generieren muss erlaubt sein für diese Funktion" - -#~ msgid "Failed to stat %s%s" -#~ msgstr "Konnte nicht auf %s%s zugreifen" - -#~ msgid "Failed to open %s.new" -#~ msgstr "Konnte %s.new nicht öffnen" - -#~ msgid "Failed to rename %s.new to %s" -#~ msgstr "Konnte %s.new nicht in %s umbenennen" - -#~ msgid "I found (binary):" -#~ msgstr "Habe gefunden (binär):" - -#~ msgid "I found (source):" -#~ msgstr "Habe gefunden (Quellen):" - -#~ msgid "Found " -#~ msgstr "Habe " - -#~ msgid " source indexes." -#~ msgstr " Quell-Indizes gefunden." - -#~ msgid "" -#~ "Unable to locate any package files, perhaps this is not a Debian Disc" -#~ msgstr "" -#~ "Konnte keine Paket-Dateien finden - vielleicht ist dies keine Debian-CD" - -#~ msgid " '" -#~ msgstr " »" - -#~ 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 arbitrary configuration option, eg -o dir::cache=/tmp\n" -#~ "See fstab(5)\n" -#~ msgstr "" -#~ "Aufruf: apt-cdrom [optionen] befehl\n" -#~ "\n" -#~ "apt-cdrom ist ein Werkzeug, um CD-ROMs zu APTs Quellliste hinzuzufügen. " -#~ "Der\n" -#~ "Einhängepunkt der CD-ROM und die Geräteinformationen werden aus apt.conf " -#~ "und\n" -#~ "/etc/fstab ermittelt.\n" -#~ "\n" -#~ "Befehle:\n" -#~ " add - Eine CD-ROM hinzufügen\n" -#~ " ident - Die Identität einer CD-ROM melden\n" -#~ "\n" -#~ "Optionen:\n" -#~ " -h Dieser Hilfetext\n" -#~ " -d CD-ROM-Einhängepunkt\n" -#~ " -r Eine erkannte CD-ROM umbenennen\n" -#~ " -m Kein Einhängen\n" -#~ " -f Schneller Modus, Paketdateien nicht überprüfen\n" -#~ " -a Gründlicher Überprüfungsmodus\n" -#~ " -c=? Diese Konfigurationsdatei lesen\n" -#~ " -o=? Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/" -#~ "tmp\n" -#~ "Siehe auch fstab(5)\n" - -#~ msgid "Internal error, non-zero counts" -#~ msgstr "Interner Fehler, Zähler nicht Null" - -#~ msgid "Couldn't wait for subprocess" -#~ msgstr "Konnte nicht auf Unterprozess warten" - -#~ msgid "....\"Have you mooed today?\"..." -#~ msgstr "....»Heute schon gemuht?«..." - -#~ msgid " New " -#~ msgstr " Neu " - -#~ msgid "B " -#~ msgstr "B " - -#~ msgid " files " -#~ msgstr " Dateien " - -#~ msgid " pkgs in " -#~ msgstr " Pakete 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 "" -#~ "Aufruf: apt-ftparchive [optionen] befehl\n" -#~ "Befehle: packages 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 arbitrary configuration option\n" -#~ msgstr "" -#~ "Optionen:\n" -#~ " -h Dieser Hilfe-Text.\n" -#~ " --md5 Steuere MD5-Generierung\n" -#~ " -s=? Binde Override-Datei ein\n" -#~ " -q Ruhig\n" -#~ " -d=? Optionale Cache-Datenbank auswählen\n" -#~ " --no-delink Debug-Modus für Delinking setzen\n" -#~ " --contents Steuere Inhaltsdatei-Generierung\n" -#~ " -c=? Lese diese Konfigurationsdatei\n" -#~ " -o=? Setze eine beliebige Konfigurations-Option\n" - -#~ msgid "Done Packages, Starting contents." -#~ msgstr "Fertig mit Pakete, beginne Inhalt." - -#~ msgid "Done. " -#~ msgstr "Fertig." - -#~ msgid "B in " -#~ msgstr "B in " - -#~ msgid " archives. Took " -#~ msgstr " Archiven. Benötigte Zeit war " - -#~ msgid "DSC file '%s' is too large!" -#~ msgstr "DSC-Datei »%s« ist zu groß!" - -#~ msgid "Could not find a record in the DSC '%s'" -#~ msgstr "Konnte keinen Eintrag im DSC »%s« finden" - -#~ msgid "Error parsing file record" -#~ msgstr "Fehler beim Lesen des Dateieintrags" - -#~ msgid "Failed too stat %s" -#~ msgstr "Kann nicht auf %s zugreifen." - -#~ msgid "Errors apply to file '%s'" -#~ msgstr "Fehler gehören zu Datei »%s«" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-12 11:18+0200\n" +"POT-Creation-Date: 2006-10-11 20:34+0200\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n" "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n" @@ -1692,12 +1692,12 @@ msgstr "ཌིཀསི་དེ་འཚོལ་མ་ཐོབ།" msgid "File not found" msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:134 -#: methods/gzip.cc:143 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:140 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -1953,12 +1953,12 @@ msgid "" msgstr "" "འོག་གི་མིང་རྟགས་ཚུ་བདེན་སྦྱོར་་འབད་མ་ཚུགས་ག་ཅི་སྦེ་ཟེར་བ་ཅིན་མི་དམང་ལྡེ་མིག་དེ་འཐོབ་མི་ཚུགས་པས:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "%s་ལས་སྦྱོར་ནང་ལས་འཛོལ་བ་ཚུ་ལྷག" @@ -2324,12 +2324,12 @@ msgstr "མི་ངོ་འཐོན་རིམཚུ།" msgid "Dependency generation" msgstr "བརྟེན་པའི་བཟོ་བཏོན།" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" @@ -2587,7 +2587,7 @@ msgid "MD5Sum mismatch" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" #: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +msgid "There is no public key available for the following key IDs:\n" msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n" #: apt-pkg/acquire-item.cc:753 @@ -2776,4 +2776,3 @@ msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལ #~ msgid "File date has changed %s" #~ msgstr "ཡིག་སྣོད་ཚེས་གྲངས་འདི་གིས་%sདེ་བསྒྱུར་བཅོས་འབད་ནུག" - @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el_new\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\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" @@ -163,7 +163,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s για %s %s είναι μεταγλωττισμένο σε %s %s\n" @@ -444,115 +444,126 @@ msgstr "Δεν ταιριαξε καμία επιλογή" msgid "Some files are missing in the package file group `%s'" msgstr "Λείπουν μερικά αρχεία από την ομάδα πακέτων '%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Η βάση είναι κατεστραμμένη, το αρχείο μετονομάστηκε σε %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Η βάση δεν είναι ενημερωμένη, γίνεται προσπάθεια να αναβαθμιστεί το %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Το άνοιγμά του αρχείου της βάσης %s: %s απέτυχε" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Η ημερομηνία του αρχείου %s έχει αλλάξει" +msgid "Failed to stat %s" +msgstr "Αποτυχία εύρεσης της κατάστασης του %s." -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχου" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Αδύνατη η πρόσβαση σε δείκτη" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Αδύνατη η ανάγνωση του καταλόγου %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Αδύνατη η εύρεση της κατάστασης του %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Σφάλματα στο αρχείο" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Αδύνατη η εύρεση του %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Αποτυχία ανεύρεσης" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Αποτυχία ανοίγματος του %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr "Αποσύνδεση %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Αποτυχία ανάγνωσης του %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Αποτυχία αποσύνδεσης του %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr " Αποτυχία σύνδεσης του %s με το %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Αποσύνδεση ορίου του %sB hit.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Αποτυχία εύρεσης της κατάστασης του %s." - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s συντηρητής είναι ο %s όχι ο %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -816,11 +827,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Αδύνατη η ανάγνωση της λίστας πηγών." @@ -851,7 +862,7 @@ msgstr "Μετά την αποσυμπίεση θα χρησιμοποιηθού msgid "After unpacking %sB disk space will be freed.\n" msgstr "Μετά την αποσυμπίεση θα ελευθερωθούν %sB χώρου από το δίσκο.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s" @@ -888,7 +899,7 @@ msgstr "Εγκατάλειψη." msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" @@ -897,7 +908,7 @@ msgstr "Αποτυχία ανάκτησης του %s %s\n" msgid "Some files failed to download" msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" @@ -1075,112 +1086,112 @@ msgstr "Χαλασμένα πακέτα" msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Προτεινόμενα πακέτα:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Απέτυχε" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Ετοιμο" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "" "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο " "υλικό" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1188,7 +1199,7 @@ msgid "" msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1197,32 +1208,32 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1406,19 +1417,19 @@ msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών" msgid "Failed to create pipes" msgstr "Αποτυχία κατά τη δημιουργία διασωληνώσεων" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Αποτυχία κατά την εκτέλεση του gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Κατεστραμμένη αρχειοθήκη" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Το Checksum του tar απέτυχε, η αρχείοθήκη είναι κατεστραμμένη" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Άγνωστη επικεφαλίδα TAR τύπος %u, μέλος %s" @@ -1685,25 +1696,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Λάθος CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, 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 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Ο δίσκος δεν βρέθηκε." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 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 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Αποτυχία εύρεσης της κατάστασης" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης" @@ -1831,7 +1842,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο msgid "Unable to accept connection" msgstr "Αδύνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Πρόβλημα κατά το hashing του αρχείου" @@ -1915,40 +1926,40 @@ msgstr "Κάτι παράξενο συνέβη κατά την εύρεση το msgid "Unable to connect to %s %s:" msgstr "Αδύνατη η σύνδεση στο %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Αδύνατη η εύρεση του '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "Ε: Λίστα Ορισμάτων από Acquire::gpgv::Options πολύ μεγάλη. Έξοδος." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του " "αποτυπώματος?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, fuzzy, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr " για την επαλήθευση της υπογραφής (είναι εγκατεστημένο το gnupg?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1956,87 +1967,87 @@ msgstr "" "Οι παρακάτω υπογραφές δεν ήταν δυνατόν να επαληθευτούν επειδή δεν ήταν " "διαθέσιμο το δημόσιο κλειδί:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Αναμονή επικεφαλίδων" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Ελαττωματική γραμμή επικεφαλίδας" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Άγνωστη μορφή ημερομηνίας" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Η επιλογή απέτυχε" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Η σύνδεση απέτυχε" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" @@ -2110,12 +2121,12 @@ msgstr "Συντακτικό σφάλμα %s:%u: Μη υποστηριζόμεν msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες στο τέλος του αρχείου" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Σφάλμα!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Ολοκληρώθηκε" @@ -2332,12 +2343,12 @@ msgstr "Υποψήφιες Εκδόσεις" msgid "Dependency generation" msgstr "Παραγωγή Εξαρτήσεων" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)" @@ -2417,7 +2428,7 @@ msgstr "" "Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση " "κάποιας κατάλληλης αρχείοθήκης." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2425,7 +2436,7 @@ msgstr "" "Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως " "προκλήθηκε από κρατούμενα πακέτα." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα." @@ -2441,12 +2452,12 @@ msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, fuzzy, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Κατέβασμα του αρχείου %li του %li (απομένουν %s)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:832 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Ανάγνωση Λίστας Πακέτων" @@ -2496,16 +2507,16 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Μη έγκυρη εγγραφή στο αρχείο προτιμήσεων, καμία επικεφαλίδα Package" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Αδύνατη η κατανόηση του τύπου καθήλωσης %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "" "Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση" @@ -2597,15 +2608,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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2614,7 +2625,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2623,7 +2634,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο." -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2631,7 +2642,7 @@ msgstr "" "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" @@ -2685,11 +2696,16 @@ msgstr "Σάρωση του δίσκου για περιεχόμενα...\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Βρέθηκαν %i κατάλογοι πακέτων, %i κατάλογοι πηγαίων και %i υπογραφές\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Αποθήκευση Ετικέτας: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Αυτό δεν είναι έγκυρο όνομα, προσπαθείστε ξανά. \n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2698,20 +2714,21 @@ msgstr "" "Ο δίσκος αυτός ονομάζεται: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Αντιγραφή λιστών πακέτων..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Eγγραφή νέας λίστας πηγών\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "Αποπροσάρτηση του CD-ROM..." #: apt-pkg/indexcopy.cc:261 @@ -2788,26 +2805,12 @@ msgstr "Αποτυχία διαγραφής του %s" msgid "Connection closed prematurely" msgstr "Η σύνδεση έκλεισε πρόωρα" -#: ftparchive/cachedb.cc:76 -msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " -"remove and re-create the database." -msgstr "" - -#: ftparchive/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" - -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" +#~ msgid "File date has changed %s" +#~ msgstr "Η ημερομηνία του αρχείου %s έχει αλλάξει" -#: methods/rred.cc:219 #, fuzzy -msgid "Could not patch file" -msgstr "Αδύνατο το άνοιγμα του αρχείου %s" +#~ msgid "Could not patch file" +#~ msgstr "Αδύνατο το άνοιγμα του αρχείου %s" #~ msgid "Reading file list" #~ msgstr "Ανάγνωση Λιστών Αρχείων" diff --git a/po/en_GB.po b/po/en_GB.po index 4ff5bba65..decb2b629 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,16 +1,16 @@ # English messages for the apt suite. # 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" +"Project-Id-Version: apt 0.6.46.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" -"PO-Revision-Date: 2002-11-10 20:56+0100\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"PO-Revision-Date: 2006-10-12 11:07+0100\n" "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n" -"Language-Team: en_GB <en@li.org>\n" +"Language-Team: en_GB <en_gb@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s compiled on %s %s\n" @@ -422,115 +422,128 @@ msgstr "No selections matched" msgid "Some files are missing in the package file group `%s'" msgstr "Some files are missing in the package file group ‘%s’" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB was corrupted, file renamed to %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB is old, attempting to upgrade %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Unable to open DB file %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "File date has changed %s" +msgid "Failed to stat %s" +msgstr "Failed to stat %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archive has no control record" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Unable to get a cursor" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Unable to read directory %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Unable to stat %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " -msgstr "E:" +msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " -msgstr "W:" +msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Errors apply to file " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Could not resolve ‘%s’" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Tree walking failed" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Failed to open %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Failed to readlink %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Failed to unlink %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Failed to link %s to %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit of %sB hit.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Failed to stat %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Archive had no package field" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s has no override entry\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s maintainer is %s not %s\n" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s has no source override entry\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s has no binary override entry either\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -602,7 +615,7 @@ msgstr "Failed to create subprocess IPC" #: ftparchive/multicompress.cc:324 msgid "Failed to exec compressor " -msgstr "Failed to exec compressor" +msgstr "Failed to exec compressor " #: ftparchive/multicompress.cc:363 msgid "decompressor" @@ -667,7 +680,7 @@ msgstr "but it is not going to be installed" #: cmdline/apt-get.cc:346 msgid " or" -msgstr "or" +msgstr " or" #: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" @@ -745,7 +758,7 @@ msgstr "Unable to correct dependencies" #: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" -msgstr "Unable to minimize the upgrade set" +msgstr "Unable to minimise the upgrade set" #: cmdline/apt-get.cc:660 msgid " Done" @@ -791,11 +804,11 @@ msgstr "Packages need to be removed but remove is disabled." msgid "Internal error, Ordering didn't finish" msgstr "Internal error, Ordering didn't finish" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Unable to lock the download directory" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "The list of sources could not be read." @@ -824,7 +837,7 @@ msgstr "After unpacking %sB of additional disk space will be used.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "After unpacking %sB disk space will be freed.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "Couldn't determine free space in %s" @@ -861,7 +874,7 @@ msgstr "Abort." msgid "Do you want to continue [Y/n]? " msgstr "Do you want to continue [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Failed to fetch %s %s\n" @@ -870,7 +883,7 @@ msgstr "Failed to fetch %s %s\n" msgid "Some files failed to download" msgstr "Some files failed to download" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Download complete and in download only mode" @@ -1043,107 +1056,107 @@ msgstr "Broken packages" msgid "The following extra packages will be installed:" msgstr "The following extra packages will be installed:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Suggested packages:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Recommended packages:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " -msgstr "Calculating upgrade..." +msgstr "Calculating upgrade... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Failed" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Done" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "Internal error, problem resolver broke stuff" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "Must specify at least one package for which to fetch source" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Unable to find a source package for %s" -#: cmdline/apt-get.cc:1950 -#, fuzzy, c-format +#: cmdline/apt-get.cc:1968 +#, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Skipping unpack of already unpacked source in %s\n" +msgstr "Skipping already downloaded file '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "You don't have enough free space in %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Need to get %sB/%sB of source archives.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Need to get %sB of source archives.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Fetch source %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Failed to fetch some archives." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Skipping unpack of already unpacked source in %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Check if the 'dpkg-dev' package is installed.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Child process failed" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "Must specify at least one package to check builddeps for" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Unable to get build-dependency information for %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s has no build depends.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1152,7 +1165,7 @@ msgstr "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1161,31 +1174,31 @@ msgstr "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Failed to satisfy %s dependency for %s: Installed package %s is too new" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Failed to satisfy %s dependency for %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-dependencies for %s could not be satisfied." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Failed to process build dependencies" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Supported modules:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1279,7 +1292,7 @@ msgstr "Ign " #: cmdline/acqprogress.cc:114 msgid "Err " -msgstr "Err" +msgstr "Err " #: cmdline/acqprogress.cc:135 #, c-format @@ -1365,19 +1378,19 @@ msgstr "Merging available information" msgid "Failed to create pipes" msgstr "Failed to create pipes" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Failed to exec gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Corrupted archive" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar checksum failed, archive corrupted" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Unknown TAR header type %u, member %s" @@ -1583,7 +1596,7 @@ msgstr "Internal error adding a diversion" #: apt-inst/deb/dpkgdb.cc:383 msgid "The pkg cache must be initialized first" -msgstr "The pkg cache must be initialized first" +msgstr "The pkg cache must be initialised first" #: apt-inst/deb/dpkgdb.cc:443 #, c-format @@ -1644,25 +1657,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Wrong CD-ROM" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Unable to unmount the CD-ROM in %s, it may still be in use." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disk not found." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "File not found" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Failed to stat" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Failed to set modification time" @@ -1790,7 +1803,7 @@ msgstr "Data socket connect timed out" msgid "Unable to accept connection" msgstr "Unable to accept connection" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem hashing file" @@ -1874,39 +1887,39 @@ msgstr "Something wicked happened resolving ‘%s:%s’ (%i)" msgid "Unable to connect to %s %s:" msgstr "Unable to connect to %s %s:" -#: methods/gpgv.cc:64 -#, fuzzy, c-format +#: methods/gpgv.cc:65 +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Could not resolve ‘%s’" +msgstr "Couldn't access keyring: '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Argument list from Acquire::gpgv::Options too long. Exiting." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Internal error: Good signature, but could not determine key fingerprint?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "At least one invalid signature was encountered." -#: methods/gpgv.cc:207 -#, fuzzy, c-format +#: methods/gpgv.cc:213 +#, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr " to verify signature (is gnupg installed?)" +msgstr "Could not execute '%s' to verify signature (is gnupg installed?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Unknown error executing gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "The following signatures were invalid:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1914,86 +1927,86 @@ msgstr "" "The following signatures couldn't be verified because the public key is not " "available:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Couldn't open pipe for %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Read error from %s process" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Waiting for headers" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Got a single header line over %u chars" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Bad header line" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "The HTTP server sent an invalid reply header" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "The HTTP server sent an invalid Content-Length header" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "The HTTP server sent an invalid Content-Range header" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "This HTTP server has broken range support" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Unknown date format" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Select failed" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Connection timed out" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Error writing to output file" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Error writing to file" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Error writing to the file" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Error reading from server. Remote end closed connection" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Error reading from server" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Bad header data" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Connection failed" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Internal error" @@ -2066,12 +2079,12 @@ msgstr "Syntax error %s:%u: Unsupported directive ‘%s’" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntax error %s:%u: Extra junk at end of file" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Error!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Done" @@ -2284,12 +2297,12 @@ msgstr "Candidate versions" msgid "Dependency generation" msgstr "Dependency generation" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Unable to parse package file %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Unable to parse package file %s (2)" @@ -2367,7 +2380,7 @@ msgid "" msgstr "" "The package %s needs to be reinstalled, but I can't find an archive for it." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2375,7 +2388,7 @@ msgstr "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "Unable to correct problems, you have held broken packages." @@ -2391,15 +2404,15 @@ msgstr "Archive directory %spartial is missing." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:830 +#, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Downloading file %li of %li (%s remaining)" +msgstr "Retrieving file %li of %li (%s remaining)" -#: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:832 +#, c-format msgid "Retrieving file %li of %li" -msgstr "Reading file listing" +msgstr "Retrieving file %li of %li" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2443,16 +2456,16 @@ msgstr "The package lists or status file could not be parsed or opened." msgid "You may want to run apt-get update to correct these problems" msgstr "You may want to run apt-get update to correct these problems" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Invalid record in the preferences file, no Package header" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Did not understand pin type %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "No priority (or zero) specified for pin" @@ -2540,15 +2553,15 @@ msgstr "IO Error saving source cache" msgid "rename failed, %s (%s -> %s)." msgstr "rename failed, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 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:647 +msgid "There is no public key available for the following key IDs:\n" +msgstr "There is no public key available for the following key IDs:\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2557,7 +2570,7 @@ 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:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2566,14 +2579,14 @@ 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:848 +#: apt-pkg/acquire-item.cc:855 #, 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:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Size mismatch" @@ -2627,11 +2640,16 @@ msgstr "Scanning disc for index files..\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Found %i package indexes, %i source indexes and %i signatures\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Stored label: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "That is not a valid name, try again.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2640,20 +2658,21 @@ msgstr "" "This disc is called: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Copying package lists..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Writing new source list\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Source list entries for this disc are:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "Unmounting CD-ROM..." #: apt-pkg/indexcopy.cc:261 @@ -2717,75 +2736,18 @@ msgid "Removed %s" msgstr "Removed %s" #: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#, c-format msgid "Preparing to completely remove %s" -msgstr "Preparing to configure %s" +msgstr "Preparing to completely remove %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#, c-format msgid "Completely removed %s" -msgstr "Failed to remove %s" +msgstr "Completely removed %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connection closed prematurely" -#: 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/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s has no override entry\n" - -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s has no override entry\n" - -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Could not open file %s" - -#~ 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" - -#~ 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 "" -#~ "Some broken packages were found while trying to process build-" -#~ "dependencies.\n" -#~ "You might want to run ‘apt-get -f install’ to correct these." - -#~ msgid "<- '" -#~ msgstr "<- ‘" - -#~ msgid "'" -#~ msgstr "‘" - -#~ msgid "-> '" -#~ msgstr "-> ‘" - -#~ msgid " '" -#~ msgstr " ‘" - -#~ msgid "....\"Have you mooed today?\"..." -#~ msgstr "....‘Have you mooed today?’..." +#~ msgid "Could not patch file" +#~ msgstr "Could not patch file" @@ -1,17 +1,19 @@ -# Advanced Package Transfer - APT message translation catalog
-# Copyright (C) 2002 Free Software Foundation, Inc.
-# Rafael Seplveda <drs@gnulinux.org.mx>, 2002.
-# Asier Llano Palacios <asierllano@infonegocio.com>
-# Javier Fernndez-Sanguino Pea <jfs@debian.org> 2003
-# Rubn Porras Campo <nahoo@inicia.es> 2004
+# Advanced Package Transfer - APT message translation catalog +# Copyright (C) 2002 Free Software Foundation, Inc. +# Rafael Sepulveda <drs@gnulinux.org.mx>, 2002. +# Asier Llano Palacios <asierllano@infonegocio.com> +# Javier Fernandez-Sanguino Pena <jfs@debian.org> 2003 +# Ruben Porras Campo <nahoo@inicia.es> 2004 +# Javier Fernandez-Sanguino <jfs@debian.org> 2006 +# msgid "" msgstr "" "Project-Id-Version: apt 0.6.42.3exp1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" -"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" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"PO-Revision-Date: 2006-10-08 00:23+0200\n" +"Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n" +"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" @@ -151,7 +153,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado en %s %s\n" @@ -435,115 +437,128 @@ msgstr "Ninguna seleccin coincide" msgid "Some files are missing in the package file group `%s'" msgstr "Faltan algunos archivos en el grupo de archivo de paquetes `%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "BD corrompida, archivo renombrado a %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB anticuada, intentando actualizar %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"El formato de la base de datos no es vlido. Debe eliminar y recrear la base " +"de datos si ha actualizado de una versin anterior de apt." + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "No se pudo abrir el archivo DB %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Cambi la fecha del archivo %s" +msgid "Failed to stat %s" +msgstr "No pude leer %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "No hay registro de control del archivo" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "No se pudo obtener un cursor" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: No se pudo leer directorio %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: No se pudo leer %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Errores aplicables al archivo '" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "No se pudo resolver %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Fall el recorrido por el rbol." -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "No se pudo abrir %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "No se pudo leer el enlace %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "No se pudo desligar %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** No pude enlazar %s con %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink se ha llegado al lmite de %sB.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "No pude leer %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Archivo no tiene campo de paquetes" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s no tiene entrada de predominio\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el encargado de %s es %s y no %s\n" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s no tiene una entrada fuente predominante\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s tampoco tiene una entrada binaria predominante\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -804,11 +819,11 @@ msgstr "Los paquetes necesitan eliminarse pero Remove est deshabilitado." msgid "Internal error, Ordering didn't finish" msgstr "Error interno, no termin el ordenamiento" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "No se pudieron leer las listas de fuentes." @@ -840,7 +855,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Se liberarn %sB despus de desempaquetar.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "No pude determinar el espacio libre en %s" @@ -877,7 +892,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Desea continuar [S/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" @@ -886,7 +901,7 @@ msgstr "Imposible obtener %s %s\n" msgid "Some files failed to download" msgstr "Algunos archivos no pudieron descargarse" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de slo descarga" @@ -1059,111 +1074,111 @@ msgstr "Paquetes rotos" msgid "The following extra packages will be installed:" msgstr "Se instalarn los siguientes paquetes extras:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Paquetes recomendados" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Calculando la actualizacin... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Fall" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Listo" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "" "Error interno, el sistema de solucin de problemas rompi\n" "algunas cosas" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su cdigo fuente" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "No se pudo encontrar un paquete de fuentes para %s" -#: cmdline/apt-get.cc:1950 -#, fuzzy, c-format +#: cmdline/apt-get.cc:1968 +#, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n" +msgstr "Ignorando fichero ya descargado '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Necesito descargar %sB/%sB de archivos fuente.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fall la orden de desempaquetamiento '%s'.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Compruebe que el paquete dpkg-dev est instalado.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fall la orden de construccin '%s'.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Fall el proceso hijo" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus\n" "dependencias de construccin" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener informacin de dependencias de construccin para %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construccin.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1172,7 +1187,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede \n" "encontrar el paquete %s" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1181,32 +1196,32 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versin\n" "disponible del paquete %s satisface los requisitos de versin" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es " "demasiado nuevo" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No se pudo satisfacer la dependencia %s para %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construccin de %s." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construccin" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Mdulos soportados:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1394,19 +1409,19 @@ msgstr "Fusionando informacin disponible" msgid "Failed to create pipes" msgstr "No pude crear las tuberas" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "No pude ejecutar gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Archivo corrompido" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "No se aprob la suma de control del tar, archive corrompido" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Cabecera del TAR tipo %u desconocida, miembro %s" @@ -1674,25 +1689,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "CD equivocado" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format 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 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disco no encontrado." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fichero no encontrado" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "No pude leer" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "No pude poner el tiempo de modificacin" @@ -1820,7 +1835,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:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Hay problemas enlazando fichero" @@ -1904,40 +1919,41 @@ msgstr "Algo raro pas resolviendo '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "No pude conectarme a %s %s:" -#: methods/gpgv.cc:64 -#, fuzzy, c-format +#: methods/gpgv.cc:65 +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "No pude resolver '%s'" +msgstr "No se pudo acceder al anillo de claves: '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Lista de argumentos de Acquire::gpgv::Options demasiado larga. Terminando." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error interno: Firma correcta, pero no se pudo determinar su huella digital?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Se encontr al menos una firma invlida." -#: methods/gpgv.cc:207 -#, fuzzy, c-format +#: methods/gpgv.cc:213 +#, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr " para verificar la firma (est instalado gnupg?)" +msgstr "" +"No se pudo ejecutar '%s' para verificar la firma (est instalado gnupg?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Error desconocido ejecutando gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Las siguientes firms fueron invlidas:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1945,86 +1961,86 @@ msgstr "" "Las firmas siguientes no se pudieron verificar porque su llave pblica no " "est disponible:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "No pude abrir una tubera para %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Error de lectura de %s procesos" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Esperando las cabeceras" -#: methods/http.cc:522 +#: methods/http.cc:523 #, 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:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Mala lnea de cabecera" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "El servidor de http envi una cabecera de respuesta invlida" -#: methods/http.cc:585 +#: methods/http.cc:586 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:600 +#: methods/http.cc:601 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:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "ste servidor de http tiene el soporte de alcance roto" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Fall la seleccin" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Expir la conexin" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerr la conexin." -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Fallo la conexin" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Error interno" @@ -2099,12 +2115,12 @@ msgstr "Error de sintaxis %s:%u: Directiva '%s' no soportada" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Error de sintaxis %s:%u: Basura extra al final del archivo" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Error!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Hecho" @@ -2319,12 +2335,12 @@ msgstr "Versiones candidatas" msgid "Dependency generation" msgstr "Generacin de dependencias" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "No se pudo tratar el archivo de paquetes %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "No se pudo tratar el archivo de paquetes %s (2)" @@ -2404,7 +2420,7 @@ msgstr "" "El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para " "ste." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2412,7 +2428,7 @@ msgstr "" "Error, pkgProblemResolver::Resolve gener cortes, esto puede haber sido " "causado por paquetes retenidos." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No se pudieron corregir los problemas, usted ha retenido paquetes\n" @@ -2430,15 +2446,15 @@ msgstr "Falta el directorio de archivos %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:830 +#, 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 +#: apt-pkg/acquire.cc:832 +#, c-format msgid "Retrieving file %li of %li" -msgstr "Leyendo Listado de Archivos" +msgstr "Descargando fichero %li de %li" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2483,17 +2499,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Tal vez quiera ejecutar 'apt-get update' para corregir estos problemas" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "" "Registro invlido en el archivo de preferencias, no hay cabecera de paquete" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "No se entiende el pin tipo %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "No hay prioridad especificada para pin (o es cero)" @@ -2586,15 +2602,17 @@ 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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "La suma MD5 difiere" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "" +"No existe ninguna clave pblica disponible para los siguientes " +"identificadores de clave:\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2604,7 +2622,7 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2613,7 +2631,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:848 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2621,7 +2639,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:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "El tamao difiere" @@ -2675,11 +2693,16 @@ msgstr "Buscando en el disco archivos de ndices...\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Se encontraron %i ndices de paquetes, %i de fuentes y %i firmas\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Etiqueta guardada: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Ese no es un nombre vlido, intntelo de nuevo.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2688,20 +2711,21 @@ msgstr "" "Este disco se llama: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Copiando las listas de paquetes..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Escribiendo nueva lista de fuente\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Las entradas de la lista de fuentes para este disco son:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "Desmontando CD-ROM..." #: apt-pkg/indexcopy.cc:261 @@ -2766,39 +2790,24 @@ msgid "Removed %s" msgstr "%s eliminado" #: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#, c-format msgid "Preparing to completely remove %s" -msgstr "Preparndose para configurar %s" +msgstr "Preparndose para eliminar completamente %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#, c-format msgid "Completely removed %s" -msgstr "No pude borrar %s" +msgstr "Se borr completamente %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "La conexin se cerr prematuramente" -#: 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/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s no tiene entrada de predominio\n" - -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s no tiene entrada de predominio\n" +#~ msgid "Could not patch file" +#~ msgstr "No pude parchear el fichero" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "No pude abrir el fichero %s" +#~ msgid "File date has changed %s" +#~ msgstr "Cambi la fecha del archivo %s" #~ msgid "Reading file list" #~ msgstr "Leyendo Lista de Archivos" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-12 11:18+0200\n" +"POT-Creation-Date: 2007-05-08 11:09+0200\n" "PO-Revision-Date: 2006-09-27 13:59+0200\n" "Last-Translator: Piarres Beobide <pi@beobide.net>\n" "Language-Team: librezale <librezale@librezale.org>\n" @@ -233,7 +233,8 @@ msgstr "" #: 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 diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan" +msgstr "" +"Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" @@ -1125,7 +1126,8 @@ msgstr "Huts egin du zenbat artxibo lortzean." #: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n" +msgstr "" +"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n" #: cmdline/apt-get.cc:2077 #, c-format @@ -1148,7 +1150,8 @@ msgstr "Prozesu umeak huts egin du" #: cmdline/apt-get.cc:2130 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:2158 #, c-format @@ -1165,7 +1168,8 @@ msgstr "%s: ez du eraikitze-mendekotasunik.\n" 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" +msgstr "" +"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" #: cmdline/apt-get.cc:2282 #, c-format @@ -1368,7 +1372,8 @@ msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "edo falta diren mendekotasunen erroreak. Hori ondo dago; mezu honen" #: 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 "" "aurreko erroreak dira garrantzitsuak. Konpondu eta exekutatu [I]nstall " "berriro" @@ -1624,7 +1629,8 @@ 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 balioz DEB fitxategi bat, ez du ez '%s' ez '%s' atalik falta du" #: apt-inst/deb/debfile.cc:112 #, c-format @@ -1660,25 +1666,26 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "CD okerra" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "Ezin izan da %s(e)ko CD-ROMa desmuntatu; beharbada erabiltzen ariko da." +msgstr "" +"Ezin izan da %s(e)ko CD-ROMa desmuntatu; beharbada erabiltzen ariko da." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Ez da diska aurkitu" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Ez da fitxategia aurkitu" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:134 -#: methods/gzip.cc:143 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Huts egin du atzitzean" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:140 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Huts egin du aldaketa-ordua ezartzean" @@ -1764,7 +1771,8 @@ 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." @@ -1808,7 +1816,7 @@ msgstr "Datu-socket konexioak denbora-muga gainditu du" msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" @@ -1858,7 +1866,8 @@ 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:108 #, c-format @@ -1902,7 +1911,8 @@ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Acquire::gpgv::Options arguimentu zerrenda luzeegia. Uzten." #: methods/gpgv.cc:204 -msgid "Internal error: Good signature, but could not determine key fingerprint?!" +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:209 @@ -1912,7 +1922,8 @@ msgstr "Beintza sinadura baliogabe bat aurkitu da." #: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gnupg instalaturik al dago?)" +msgstr "" +"Ezin da %s abiarazi sinadura egiaztatzeko (gnupg instalaturik al dago?)" #: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" @@ -1930,86 +1941,86 @@ msgstr "" "Ondorengo sinadurak ezin dira egiaztatu gako publikoa ez bait dago " "eskuragarri:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Ezin izan da %s(r)en kanalizazioa ireki" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Irakurri errorea %s prozesutik" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Goiburuen zain" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Okerreko goiburu-lerroa" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "http zerbitzariak erantzun-buru baliogabe bat bidali du." -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "http zerbitzariak barruti onarpena apurturik du" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Datu-formatu ezezaguna" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Konexioaren denbora-muga gainditu da" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Barne-errorea" @@ -2082,12 +2093,12 @@ msgstr "Sintaxi-errorea, %s:%u: onartu gabeko '%s' direktiba" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Sintaxi-errorea, %s:%u: Zabor gehigarria fitxategi-amaieran" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Errorea!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Eginda" @@ -2116,7 +2127,8 @@ 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 @@ -2167,7 +2179,8 @@ msgstr "Ezin izan da %s blokeo-fitxategia ireki" #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat" +msgstr "" +"Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat" #: apt-pkg/contrib/fileutl.cc:109 #, c-format @@ -2302,12 +2315,12 @@ msgstr "Hautagaien bertsioak" msgid "Dependency generation" msgstr "Dependentzi Sormena" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ezin da %s pakete-fitxategia analizatu (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ezin da %s pakete-fitxategia analizatu (2)" @@ -2381,10 +2394,12 @@ msgstr "'%s' motako indize-fitxategirik ez da onartzen" #: 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 paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2392,7 +2407,7 @@ msgstr "" "Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada " "atxikitako paketeek eraginda." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu." @@ -2408,12 +2423,12 @@ msgstr "%spartial artxibo-direktorioa falta da." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:832 #, c-format msgid "Retrieving file %li of %li" msgstr "%li fitxategia jasotzen %li-tik" @@ -2459,16 +2474,16 @@ msgstr "Pakete-zerrendak edo egoera-fitxategia ezin dira analizatu edo ireki." msgid "You may want to run apt-get update to correct these problems" msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Erregistro baliogabea hobespenen fitxategian, pakete-goibururik ez" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Ez da ulertu %s orratz-mota (pin)" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)" @@ -2556,15 +2571,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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "MD5Sum ez dator bat" -#: 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:647 +msgid "There is no public key available for the following key IDs:\n" +msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2573,7 +2588,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2582,14 +2597,15 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea." -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:855 #, 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 "" "Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " "paketearentzat." -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Tamaina ez dator bat" @@ -2643,11 +2659,16 @@ msgstr "Indize fitxategien bila diska arakatzen...\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "%i pakete indize, %i jatorri indize eta %i sinadura aurkitu dira\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, c-format +msgid "Found label '%s'\n" +msgstr "Aurkitutako Etiketa: '%s' \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Hau ez baliozko izen bat, froga berriro.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2656,21 +2677,21 @@ msgstr "" "Diskaren izen:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Pakete zerrendak kopiatzen..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "jatorri zerrenda berria idazten\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Diskarentzako jaotrri sarrerak:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "CD-ROM Desmuntatzen..." +#: apt-pkg/cdrom.cc:807 +msgid "Unmounting CD-ROM...\n" +msgstr "CD-ROM Desmuntatzen...\n" #: apt-pkg/indexcopy.cc:261 #, c-format @@ -2690,7 +2711,8 @@ msgstr "%i erregistro eta %i okerreko fitxategi grabaturik.\n" #: apt-pkg/indexcopy.cc:269 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n" +msgstr "" +"%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n" #: apt-pkg/deb/dpkgpm.cc:358 #, c-format @@ -2746,3 +2768,5 @@ msgstr "%s guztiz ezabatu da" msgid "Connection closed prematurely" msgstr "Konexioa behar baino lehenago itxi da" +#~ msgid "Could not patch file" +#~ msgstr "Ezin izan zaio fixtategiari adabakia ezarri" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-12 11:18+0200\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" "PO-Revision-Date: 2006-09-29 16:06+0300\n" "Last-Translator: Tapio Lehtonen <tale@debian.org>\n" "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" @@ -440,7 +440,9 @@ msgstr "Tietokanta on vanha, yritetään päivittää %s" msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." -msgstr "Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, on tietokanta poistettava ja luotava uudelleen." +msgstr "" +"Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, " +"on tietokanta poistettava ja luotava uudelleen." #: ftparchive/cachedb.cc:81 #, c-format @@ -1662,25 +1664,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Väärä romppu" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Rompun %s irrottaminen ei onnistu, se on ehkä käytössä." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Levyä ei löydy" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Tiedostoa ei löydy" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:134 -#: methods/gzip.cc:143 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Komento stat ei toiminut" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:140 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua" @@ -1808,7 +1810,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin" msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" @@ -1934,86 +1936,86 @@ msgstr "" "Seuraavia allekirjoituksia ei voinut varmentaa koska julkista avainta ei ole " "saatavilla:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Putkea %s ei voitu avata" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Prosessi %s ilmoitti lukuvirheestä" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Odotetaan otsikoita" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Virheellinen otsikkorivi" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "HTTP-palvelimen arvoaluetuki on rikki" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Sisäinen virhe" @@ -2086,12 +2088,12 @@ msgstr "Syntaksivirhe %s: %u: Tätä direktiiviä ei tueta \"%s\"" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Virhe!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Valmis" @@ -2304,12 +2306,12 @@ msgstr "Mahdolliset versiot" msgid "Dependency generation" msgstr "Luodaan riippuvuudet" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Pakettitiedostoa %s (2) ei voi jäsentää" @@ -2386,7 +2388,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei löydy." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2394,7 +2396,7 @@ msgstr "" "Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt " "paketit." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty." @@ -2410,12 +2412,12 @@ msgstr "Arkistokansio %spartial puuttuu." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:832 #, c-format msgid "Retrieving file %li of %li" msgstr "Noudetaan tiedosto %li / %li" @@ -2462,16 +2464,16 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Voit haluta suorittaa apt-get update näiden pulmien korjaamiseksi" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Asetustiedostossa on virheellinen tietue, Package-otsikko puuttuu" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Tunnistetyyppi %s on tuntematon" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)" @@ -2560,15 +2562,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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "MD5Sum ei täsmää" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2577,7 +2579,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:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2586,7 +2588,7 @@ msgstr "" "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan " "tämän paketin itse." -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2594,7 +2596,7 @@ msgstr "" "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Koko ei täsmää" @@ -2650,11 +2652,16 @@ msgstr "" "Asennuspakettien hakemistoja löytyi %i, lähdekoodipakettien hakemistoja %i " "ja allekirjoituksia %i\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Tallennettu nimio: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Tuo ei kelpaa nimeksi, yritä uudelleen.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2663,20 +2670,21 @@ msgstr "" "Tämä levy on: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Kopioidaan pakettiluetteloita..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Kirjoitetaan uusi lähdeluettelo\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "Irrotetaan romppu..." #: apt-pkg/indexcopy.cc:261 @@ -2758,14 +2766,12 @@ msgstr "Yhteys katkesi ennenaikaisesti" #~ msgid "File date has changed %s" #~ msgstr "Tiedoston uusi päiväys %s" -#, fuzzy #~ msgid "Could not patch file" #~ msgstr "Tiedostoa %s ei voitu avata" #~ msgid "Reading file list" #~ msgstr "Luetaan tiedostoluetteloa" -#, fuzzy #~ msgid "Could not execute " #~ msgstr "Lukkoa %s ei saada" @@ -3,13 +3,13 @@ # French messages # # Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004. -# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006. +# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006, 2007. msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" -"PO-Revision-Date: 2006-09-02 09:59+0200\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"PO-Revision-Date: 2007-05-08 11:30+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -151,7 +151,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 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" @@ -433,115 +433,128 @@ msgstr "Aucune slection ne correspond" msgid "Some files are missing in the package file group `%s'" msgstr "Quelques fichiers sont manquants dans le groupe de fichiers de paquets %s" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Base de donnes corrompue, fichier renomm en %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Base de donnes ancienne, tentative de mise jour de %s\"" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"Le format de la base de donnes n'est pas valable. Si vous mettez APT " +"jour, veuillez supprimer puis recrer la base de donnes." + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Impossible d'ouvrir le fichier de base de donnes %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "La date du fichier a chang %s" +msgid "Failed to stat %s" +msgstr "Impossible de statuer %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "L'archive n'a pas d'enregistrement de contrle" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Impossible d'obtenir un curseur" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Impossible de lire le contenu du rpertoire %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Impossible de statuer %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: des erreurs sont survenues sur le fichier " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Impossible de rsoudre %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "chec du parcours de l'arbre" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Impossible d'ouvrir %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " Dlier %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Impossible de lire le lien %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Impossible de dlier %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Impossible de lier %s %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Seuil de delink de %so atteint.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Impossible de statuer %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "L'archive ne possde pas de champ de paquet" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr "%s ne possde pas d'entre override\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " le responsable de %s est %s et non %s\n" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s ne possde pas d'entre source override\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s ne possde pas galement pas d'entre binary override\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -803,11 +816,11 @@ msgstr "Les paquets doivent tre enlevs mais la dsinstallation est dsactive. msgid "Internal error, Ordering didn't finish" msgstr "Erreur interne. Le tri a t interrompu." -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le rpertoire de tlchargement" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "La liste des sources ne peut tre lue." @@ -838,7 +851,7 @@ msgstr "Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\ msgid "After unpacking %sB disk space will be freed.\n" msgstr "Aprs dpaquetage, %so d'espace disque seront librs.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossible de dterminer l'espace disponible sur %s" @@ -858,7 +871,7 @@ msgstr "" # sentence is supposed to be typed by a user who cannot see the difference. #: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" -msgstr "Oui, faites ce que je vous dis!" +msgstr "Oui, faites ce que je vous dis !" #: cmdline/apt-get.cc:868 #, c-format @@ -879,7 +892,7 @@ msgstr "Annulation." msgid "Do you want to continue [Y/n]? " msgstr "Souhaitez-vous continuer [O/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de rcuprer %s %s\n" @@ -888,7 +901,7 @@ msgstr "Impossible de rcuprer %s %s\n" msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu tre tlchargs." -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Tlchargement achev et dans le mode tlchargement uniquement" @@ -1061,111 +1074,111 @@ msgstr "Paquets dfectueux" msgid "The following extra packages will be installed:" msgstr "Les paquets supplmentaires suivants seront installs: " -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Paquets suggrs:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Paquets recommands:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Calcul de la mise jour... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "chec" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Fait" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "" "Erreur interne, la tentative de rsolution du problme a cass certaines " "parties" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "Vous devez spcifier au moins un paquet source" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossible de trouver une source de paquet pour %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saut du tlchargement du fichier %s, dj tlcharg\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Ncessit de prendre %so/%so dans les sources.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Ncessit de prendre %so dans les sources.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Rcupration des sources %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "chec lors de la rcupration de quelques archives." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saut du dcompactage des paquets sources dj dcompacts dans %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de dcompactage %s a chou.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Veuillez vrifier si le paquet dpkg-dev est install.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction %s a chou.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "chec du processus fils" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" "Il faut spcifier au moins un paquet pour vrifier les dpendances de " "construction" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossible d'obtenir les dpendances de construction pour %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dpendance de construction.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1174,7 +1187,7 @@ msgstr "" "La dpendance %s vis--vis de %s ne peut tre satisfaite car le paquet %s ne " "peut tre trouv" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1183,32 +1196,32 @@ msgstr "" "La dpendance %s vis--vis de %s ne peut tre satisfaite car aucune version " "du paquet %s ne peut satisfaire la version requise" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Impossible de satisfaire la dpendance %s pour %s: le paquet install %s " "est trop rcent" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Impossible de satisfaire les dpendances %s pour %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Les dpendances de compilation pour %s ne peuvent pas tre satisfaites." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dpendances de construction" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Modules reconnus:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1394,19 +1407,19 @@ msgstr "Fusion des informations disponibles" msgid "Failed to create pipes" msgstr "chec de cration de tubes" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Impossible d'excuter gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Archive corrompue" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "chec dans la somme de contrle de tar, l'archive est corrompue" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Type d'en-tte %u inconnu pour TAR, partie %s" @@ -1675,27 +1688,27 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Mauvais cdrom" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Impossible de dmonter le cdrom dans %s, il doit toujours tre en cours " "d'utilisation." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disque non trouv." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fichier non trouv" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Impossible de statuer" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Impossible de modifier l'heure " @@ -1823,7 +1836,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:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problme de hachage du fichier" @@ -1909,41 +1922,41 @@ msgstr "" msgid "Unable to connect to %s %s:" msgstr "Impossible de se connecter %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Impossible d'accder au porte-cls:%s" +msgstr "Impossible d'accder au porte-cls:%s" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: liste de paramtres trop longue pour Acquire::gpgv::Options. Abandon." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erreur interne: signature correcte, mais il est impossible de dterminer " "l'empreinte de la cl." -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Au moins une signature non valable a t rencontre." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" "Impossible d'excuter %s pour contrler la signature\n" "(veuillez vrifier si gnupg est install)." -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Erreur inconnue l'excution de gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Les signatures suivantes ne sont pas valables:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1951,86 +1964,86 @@ msgstr "" "Les signatures suivantes n'ont pas pu tre vrifies car la cl publique " "n'est pas disponible:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Ne parvient pas ouvrir le tube pour %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Erreur de lecture du processus %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Attente des fichiers d'en-tte" -#: methods/http.cc:522 +#: methods/http.cc:523 #, 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:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Mauvaise ligne d'en-tte" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 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:585 +#: methods/http.cc:586 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:600 +#: methods/http.cc:601 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:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Ce serveur http possde un support des limites non-valide" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Slection dfaillante" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Dlai de connexion dpass" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Erreur d'criture du fichier de sortie" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Erreur d'criture sur un fichier" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Erreur d'criture sur le fichier" -#: methods/http.cc:874 +#: methods/http.cc:875 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:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Mauvais en-tte de donne" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "chec de la connexion" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Erreur interne" @@ -2105,12 +2118,12 @@ msgstr "Erreur syntaxique %s:%u: directive %s non tolre" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erreur syntaxique %s:%u: valeur aberrante la fin du fichier" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Erreur!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fait" @@ -2323,12 +2336,12 @@ msgstr "Versions possibles" msgid "Dependency generation" msgstr "Gnration des dpendances" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossible de traiter le fichier %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossible de traiter le fichier %s (2)" @@ -2407,7 +2420,7 @@ msgstr "" "Le paquet %s doit tre rinstall, mais je ne parviens pas trouver son " "archive." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2415,7 +2428,7 @@ msgstr "" "Erreur, pkgProblemResolver::Resolve a gnr des ruptures, ce qui a pu tre " "caus par les paquets devant tre gards en l'tat." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Impossible de corriger les problmes, des paquets dfecteux sont en mode " @@ -2433,12 +2446,12 @@ msgstr "Le rpertoire d'archive %spartial n'existe pas." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Tlchargement du fichier %li de %li (%s restant)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:832 #, c-format msgid "Retrieving file %li of %li" msgstr "Tlchargement du fichier %li de %li" @@ -2488,18 +2501,18 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Vous pouvez lancer apt-get update pour corriger ces problmes." -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "" "Enregistrement invalide dans votre fichier prfrences, aucune entre " "Package." -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "tiquette %s inconnue" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Aucune priorit (ou zro) n'a t spcifie pour l'tiquette" @@ -2593,15 +2606,15 @@ msgstr "Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sou 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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "Somme de contrle MD5 incohrente" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "Aucune cl publique n'est disponible pour la/les cl(s) suivante(s):\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2611,7 +2624,7 @@ msgstr "" "sans doute que vous devrez corriger ce paquet manuellement (absence " "d'architecture)." -#: apt-pkg/acquire-item.cc:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2620,14 +2633,14 @@ 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:848 +#: apt-pkg/acquire-item.cc:855 #, c-format 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:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Taille incohrente" @@ -2681,11 +2694,16 @@ msgstr "Examen du disque la recherche de fichiers d'index...\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "%i index de paquets trouvs, %i index de sources et %i signatures\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, c-format +msgid "Found label '%s'\n" +msgstr "tiquette %s trouve\n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Ce nom n'est pas valable, veuillez recommencer.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2694,21 +2712,21 @@ msgstr "" "Ce disque s'appelle:\n" "%s\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Copie des listes de paquets..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "criture de la nouvelle liste de sources\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Les entres de listes de sources pour ce disque sont:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "Dmontage du cdrom..." +#: apt-pkg/cdrom.cc:807 +msgid "Unmounting CD-ROM...\n" +msgstr "Dmontage du cdrom...\n" #: apt-pkg/indexcopy.cc:261 #, c-format @@ -2786,23 +2804,3 @@ msgstr "%s compltement supprim" msgid "Connection closed prematurely" msgstr "Connexion ferme prmaturment" -#: 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 "Le format de la base de donnes n'est pas valable. Si vous mettez APT jour, veuillez supprimer puis recrer la base de donnes." - -#: ftparchive/writer.cc:623 -#, c-format -msgid " %s has no source override entry\n" -msgstr " %s ne possde pas d'entre source override\n" - -#: ftparchive/writer.cc:627 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s ne possde pas galement pas d'entre binary override\n" - -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Impossible de modifier (patch) %s" - @@ -6,10 +6,10 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 16:17+0200\n" -"PO-Revision-Date: 2006-09-07 11:48+0200\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"PO-Revision-Date: 2007-02-28 13:14+0100\n" "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n" -"Language-Team: Galician <trasno@ceu.fi.udc.es>\n" +"Language-Team: Galician <proxecto@trasno.net>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -108,7 +108,7 @@ msgstr "" #: 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 @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2380 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 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" @@ -815,11 +815,11 @@ msgstr "Hai que eliminar paquetes pero a eliminación está desactivada." msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, a ordeación non rematou" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Non se puido bloquear o directorio de descargas" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2128 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Non se puido ler a lista de orixes." @@ -849,7 +849,7 @@ msgstr "Despois de desempaquetar hanse ocupar %sB de disco adicionais.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Despois de desempaquetar hanse liberar %sB de disco.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "Non se puido determinar o espazo libre en %s" @@ -886,7 +886,7 @@ msgstr "Abortar." msgid "Do you want to continue [Y/n]? " msgstr "¿Quere continuar [S/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2025 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Non se puido obter %s %s\n" @@ -895,7 +895,7 @@ msgstr "Non se puido obter %s %s\n" msgid "Some files failed to download" msgstr "Non se puido descargar algúns ficheiros" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Completouse a descarga no modo de só descargas" @@ -1068,110 +1068,110 @@ msgstr "Paquetes rotos" msgid "The following extra packages will be installed:" msgstr "Hanse instalar os seguintes paquetes extra:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Paquetes suxiridos:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Paquetes recomendados:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "A calcular a actualización... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Fallou" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Rematado" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "Erro interno, o resolvedor interno rompeu cousas" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "" "Ten que especificar alomenos un paquete para lle descargar o código fonte" -#: cmdline/apt-get.cc:1917 cmdline/apt-get.cc:2146 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Non se puido atopar un paquete fonte para %s" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omítese o ficheiro xa descargado \"%s\"\n" -#: cmdline/apt-get.cc:1985 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "Non hai espazo libre de abondo en %s" -#: cmdline/apt-get.cc:1990 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai que recibir %sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:1999 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:2030 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Non se puido recibir algúns arquivos." -#: cmdline/apt-get.cc:2058 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n" -#: cmdline/apt-get.cc:2070 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fallou a orde de desempaquetamento \"%s\".\n" -#: cmdline/apt-get.cc:2071 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n" -#: cmdline/apt-get.cc:2088 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fallou a codificación de %s.\n" -#: cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "O proceso fillo fallou" -#: cmdline/apt-get.cc:2123 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" "Ten que especificar alomenos un paquete para lle comprobar as dependencias " "de compilación" -#: cmdline/apt-get.cc:2151 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Non se puido obter a información de dependencias de compilación de %s" -#: cmdline/apt-get.cc:2171 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ten dependencias de compilación.\n" -#: cmdline/apt-get.cc:2223 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1180,7 +1180,7 @@ msgstr "" "A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar " "o paquete %s" -#: cmdline/apt-get.cc:2275 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1189,32 +1189,32 @@ msgstr "" "A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión " "dispoñible do paquete %s satisfai os requirimentos de versión" -#: cmdline/apt-get.cc:2310 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é " "novo de máis" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non se puideron satisfacer as dependencias de compilación de %s." -#: cmdline/apt-get.cc:2353 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Non se puido procesar as dependencias de compilación" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Módulos soportados:" -#: cmdline/apt-get.cc:2426 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1676,25 +1676,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "CD-ROM incorrecto" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Non se puido desmontar o CD-ROM de %s, pode estarse empregando aínda." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Non se atopou o disco" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Non se atopou o ficheiro" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Non se atopou" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Non se puido estabrecer a hora de modificación" @@ -1823,7 +1823,7 @@ msgstr "A conexión do socket de datos esgotou o tempo" msgid "Unable to accept connection" msgstr "Non se pode aceptar a conexión" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" @@ -1951,86 +1951,86 @@ msgstr "" "Non se puido verificar as seguintes sinaturas porque a chave pública non " "está dispoñible:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Non se puido abrir unha canle para %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Erro de lectura do proceso %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "A agardar polas cabeceiras" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Recibiuse unha soa liña de cabeceira en %u caracteres" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Liña de cabeceira incorrecta" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor HTTP enviou unha cabeceira de resposta non válida" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "O servidor HTTP enviou unha cabeceira Content-Length non válida" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor HTTP enviou unha cabeceira Content-Range non válida" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Este servidor HTTP ten un soporte de rangos roto" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Formato de data descoñecido" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Fallou a chamada a select" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "A conexión esgotou o tempo" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Erro ao escribir no ficheiro de saída" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Erro ao escribir nun ficheiro" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Erro ao escribir no ficheiro" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Erro ao ler do servidor" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Datos da cabeceira incorrectos" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "A conexión fallou" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Erro interno" @@ -2103,12 +2103,12 @@ msgstr "Erro de sintaxe %s:%u: Non se soporta a directiva \"%s\"" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra á fin da liña" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... ¡Erro!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Rematado" @@ -2322,12 +2322,12 @@ msgstr "Versións candidatas" msgid "Dependency generation" msgstr "Xeración de dependencias" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Non se pode analizar o ficheiro de paquetes %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Non se pode analizar o ficheiro de paquetes %s (2)" @@ -2405,7 +2405,7 @@ msgid "" msgstr "" "O paquete %s ten que se reinstalar, pero non se pode atopar o seu arquivo." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2413,7 +2413,7 @@ msgstr "" "Erro, pkgProblemResolver::Resolve xerou interrupcións, pode estar causado " "por paquetes retidos." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "Non se poden resolver os problemas, ten retidos paquetes rotos." @@ -2429,12 +2429,12 @@ msgstr "O directorio de arquivos %spartial falla." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "A obter o ficheiro %li de %li (fallan %s)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:832 #, c-format msgid "Retrieving file %li of %li" msgstr "A obter o ficheiro %li de %li" @@ -2481,18 +2481,18 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Pode querer executar apt-get update para corrixir estes problemas" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 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 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Non se entendeu o tipo de inmobilización %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "" "Non se indicou unha prioridade (ou indicouse cero) para a inmobilización" @@ -2581,16 +2581,16 @@ msgstr "Erro de E/S ao gravar a caché de fontes" msgid "rename failed, %s (%s -> %s)." msgstr "fallou o cambio de nome, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 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" +#: apt-pkg/acquire-item.cc:647 +msgid "There is 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:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2599,7 +2599,7 @@ 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:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2608,7 +2608,7 @@ 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:848 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2616,7 +2616,7 @@ msgstr "" "Os ficheiros de índices de paquetes están corrompidos. Non hai un campo " "Filename: para o paquete %s." -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Os tamaños non coinciden" @@ -2671,11 +2671,16 @@ 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 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Etiqueta armacenada: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Ese non é un nome válido, volva tentalo.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2684,20 +2689,21 @@ msgstr "" "Este disco chámase: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "A copiar as listas de paquetes..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "A gravar a nova lista de fontes\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "As entradas da lista de fontes deste disco son:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "A desmontar o CD-ROM..." #: apt-pkg/indexcopy.cc:261 @@ -2776,13 +2782,12 @@ msgstr "Eliminouse %s completamente" msgid "Connection closed prematurely" msgstr "A conexión pechouse prematuramente" +#~ msgid "Could not patch file" +#~ msgstr "Non se puido parchear o ficheiro" + #~ msgid "File date has changed %s" #~ msgstr "A data do ficheiro cambiou %s" -#, fuzzy -#~ msgid "Could not patch file" -#~ msgstr "Non se puido abrir o ficheiro %s" - #~ msgid "Reading file list" #~ msgstr "A ler a lista de paquetes" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-04 18:51+0100\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n" "Language-Team: Hebrew\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:2378 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 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" @@ -327,115 +327,126 @@ msgstr "אין התאמות" msgid "Some files are missing in the package file group `%s'" msgstr "חלק מהקבצים חסרים בקבוצת קבצי החבילה `%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "מסד הנתונים אינו תקין, הקובץ הועבר ל-%s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "מסד הנתונים ישן, מנסה לשדרג ל-%s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "לא מצליח לפתוח את קובץ מסד הנתונים %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "תאריך הקובץ השתנה %s" +msgid "Failed to stat %s" +msgstr "" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: לא מצליח לקרוא את הספריה %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: שגיאות תקפות לקובץ" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "כשלון בפענוח %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "כשלון בפתיחת %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: 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 "*** כשלון בקישור %s ל-%s" -#: 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:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "המתחזק של %s הוא %s ולא %s\n" +#: 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" @@ -535,7 +546,7 @@ msgstr "כשלון בשינוי השם %s ל-%s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -698,11 +709,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "לא מצליח לנעול את ספרית ההורדה." -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "רשימת המקורות לא ניתנת לקריאה." @@ -731,7 +742,7 @@ msgstr "אחרי פריסה %sB נוספים יהיו בשימוש.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "אחרי פריסה %sB נוספים ישוחררו.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "אין לך מספיק מקום פנוי ב-%s." @@ -766,7 +777,7 @@ msgstr "בטל." 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:2023 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "כשלון בהבאת %s %s\n" @@ -775,7 +786,7 @@ msgstr "כשלון בהבאת %s %s\n" msgid "Some files failed to download" msgstr "כשלון בהורדת חלק מהקבצים" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד." @@ -871,7 +882,7 @@ msgstr "" msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "" @@ -885,27 +896,27 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1525 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1555 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1558 +#: 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:1570 +#: 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" @@ -913,164 +924,164 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1578 +#: 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:1583 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1586 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1612 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1684 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1712 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "שגיאה פנימית, כלשון ביצירת %s" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1968 #, c-format -msgid "Skiping already downloaded file '%s'\n" +msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1983 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1991 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2028 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2069 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2086 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2121 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2149 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2169 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2221 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2273 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2333 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2347 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2351 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2383 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1198,19 +1209,19 @@ msgstr "" msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" @@ -1371,7 +1382,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 "" @@ -1415,10 +1426,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" @@ -1476,26 +1483,26 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 #, fuzzy msgid "Disk not found." msgstr "(לא נמצא)" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 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/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "" @@ -1621,7 +1628,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1644,7 +1651,7 @@ msgstr "" msgid "Query" msgstr "" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "" @@ -1673,155 +1680,156 @@ 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:65 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "" + +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:209 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:213 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:249 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "" -#: methods/http.cc:381 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:527 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:535 +#: methods/http.cc:531 msgid "Bad header line" msgstr "" -#: methods/http.cc:554 methods/http.cc:561 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:590 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:605 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:607 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:631 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "" -#: methods/http.cc:778 +#: methods/http.cc:774 msgid "Select failed" msgstr "" -#: methods/http.cc:783 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "" -#: methods/http.cc:806 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:837 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "" -#: methods/http.cc:865 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:879 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:881 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1112 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "" -#: methods/http.cc:1129 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "" -#: methods/http.cc:1220 +#: methods/http.cc:1216 msgid "Internal error" msgstr "" @@ -1894,12 +1902,12 @@ msgstr "" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "" @@ -2100,24 +2108,24 @@ msgstr "" msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" @@ -2191,13 +2199,13 @@ 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:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "" @@ -2211,9 +2219,16 @@ msgstr "" msgid "Archive directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:821 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:830 #, c-format -msgid "Downloading file %li of %li (%s remaining)" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "" + +#: apt-pkg/acquire.cc:832 +#, c-format +msgid "Retrieving file %li of %li" msgstr "" #: apt-pkg/acquire-worker.cc:113 @@ -2257,16 +2272,16 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "" @@ -2354,31 +2369,35 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:719 +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:760 #, 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:778 +#: apt-pkg/acquire-item.cc:819 #, 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:814 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:901 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "" @@ -2430,31 +2449,36 @@ msgstr "" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, c-format +msgid "Found label '%s'\n" +msgstr "" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +msgid "Unmounting CD-ROM...\n" msgstr "" #: apt-pkg/indexcopy.cc:261 @@ -2519,14 +2543,17 @@ 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/rsh.cc:330 msgid "Connection closed prematurely" msgstr "" + +#~ msgid "File date has changed %s" +#~ msgstr "תאריך הקובץ השתנה %s" @@ -7,10 +7,10 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" -"PO-Revision-Date: 2006-07-02 07:34+0100\n" -"Last-Translator: SZERVÑC Attila <sas@321.hu>\n" -"Language-Team: Hungarian <debian-l10-hungarian>\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"PO-Revision-Date: 2006-10-21 11:04+0100\n" +"Last-Translator: SZERVÁC Attila <sas@321.hu>\n" +"Language-Team: Hungarian <debian-l10n-hungarian>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -153,7 +153,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s ehhez: %s %s fordítás ideje: %s %s\n" @@ -429,115 +429,128 @@ msgstr "Nincs illeszkedő kiválasztás" msgid "Some files are missing in the package file group `%s'" msgstr "Néhány fájl hiányzik a(z) '%s' csomagfájl-csoportból" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB megsérült, a fájl átnevezve %s.old-ra" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB régi, megkísérlem frissíteni erre: %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"DB formátum érvénytelen. Ha az apt régebbi változatáról frissítettél, töröld " +"és hozd újra létre az adatbázist." + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "A fájl dátuma megváltozott %s" +msgid "Failed to stat %s" +msgstr "%s elérése sikertelen" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Az archívumnak nincs vezérlő rekordja" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Nem sikerült egy mutatóhoz jutni" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "F: nem lehet a(z) %s könyvtárat olvasni\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "F: %s nem érhető el\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "H: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "F: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "H: Hibás a fájl " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Nem sikerült feloldani ezt: %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Fabejárás nem sikerült" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "%s megnyitása sikertelen" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "readlink nem hajtható végre erre: %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "unlink nem hajtható végre erre: %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s linkelése ehhez: %s sikertelen" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink elérte %sB korlátját.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "%s elérése sikertelen" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Az archívumnak nem volt csomag mezője" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s karbantartója %s, nem %s\n" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s nem rendelkezik forrás felülbíráló bejegyzéssel\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s nem rendelkezik bináris felülbíráló bejegyzéssel sem\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -798,11 +811,11 @@ msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyeze msgid "Internal error, Ordering didn't finish" msgstr "Belső hiba, a rendezés nem zárult" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Nem tudom zárolni a letöltési könyvtárat" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A források listája olvashatatlan." @@ -831,7 +844,7 @@ msgstr "Kicsomagolás után %sB lemezterületet használok fel\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Kicsomagolás után %sB lemezterület szabadul fel.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nem határozható meg a szabad hely itt: %s" @@ -868,7 +881,7 @@ msgstr "Megszakítva." msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarod [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" @@ -877,7 +890,7 @@ msgstr "Sikertelen letöltés: %s %s\n" msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "A letöltés befejeződött a 'csak letöltés' módban" @@ -1049,110 +1062,110 @@ msgstr "Törött csomagok" msgid "The following extra packages will be installed:" msgstr "Az alábbi extra csomagok kerülnek telepítésre:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Javasolt csomagok:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Sikertelen" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Kész" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "Belső hiba, hibafeloldó gond" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "" "Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A már letöltött '%s' fájl kihagyása\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB forrás-archívumot kell letölteni.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB forrás-archívumot kell letölteni.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s' elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" "Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni " "kell" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nem lehet %s fordítási-függőség információját beszerezni" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "Nincs fordítási függősége a következőnek: %s.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1161,7 +1174,7 @@ msgstr "" "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem " "található" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1170,32 +1183,32 @@ msgstr "" "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a " "verzió-követelményt kielégítő elérhető verziója." -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl " "friss." -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s " -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s építési függőségei nem elégíthetőek ki." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1373,19 +1386,19 @@ msgstr "Elérhető információk egyesítése" msgid "Failed to create pipes" msgstr "Nem sikerült csöveket létrehozni" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Nem sikerült a gzipet futtatni " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Hibás archívum" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar ellenőrzőösszeg nem egyezik, az archívum megsérült" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ismeretlen a(z) %u TAR fejléc típus, %s tag" @@ -1652,25 +1665,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Hibás CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Nem lehet lecsatolni az itt lévő CD-ROM-ot: %s, talán még használod." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Nem találom a lemezt" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 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:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Nem érhető el" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "A módosítási időt beállítása sikertelen" @@ -1798,7 +1811,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időt" msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" @@ -1882,124 +1895,124 @@ msgstr "Valami rossz történt '%s: %s' feloldásakor (%i)" msgid "Unable to connect to %s %s:" msgstr "Sikertelen kapcsolódás ide: %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "%s kulcstartó nem érhető el" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "H: Az Acquire::gpgv::Options argumentum lista túl hosszú. Kilépek." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Belső hiba: Jó aláírás, de meghatározhatatlan kulcs ujjlenyomat?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "1 vagy több érvénytelen aláírást találtam." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "'%s' nem futtatható az aláírás ellenőrzéséhez (a gnupg telepítve van?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Ismeretlen gpgv futtatási hiba" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Az alábbi aláírások érvénytelenek voltak:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" "Az alábbi aláírások nem igazolhatók, mert a nyilvános kulcs nem elérhető:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Nem lehet csövet nyitni ehhez: %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Olvasási hiba %s folyamattól" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Várakozás a fejlécekre" -#: methods/http.cc:522 +#: methods/http.cc:523 #, 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:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Rossz fejléc sor" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 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:585 +#: methods/http.cc:586 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:600 +#: methods/http.cc:601 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:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Ez a http szerver támogatja a sérült tartományokat " -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Ismeretlen dátum formátum" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Sikertelen kiválasztás" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Hiba fájl írásakor" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:874 +#: methods/http.cc:875 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:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Rossz fejlécadat" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Sikertelen kapcsolódás" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Belső hiba" @@ -2073,12 +2086,12 @@ msgstr "Szintaktikai hiba %s: %u: '%s' nem támogatott előírás" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Szintaktikai hiba %s: %u: fölösleges szemét a fájl végén" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Hiba!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Kész" @@ -2292,12 +2305,12 @@ msgstr "Lehetséges verziók" msgid "Dependency generation" msgstr "Függőség-generálás" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)" @@ -2375,7 +2388,7 @@ msgid "" msgstr "" "A(z) %s csomagot újra kell telepíteni, de nem találok archívumot hozzá." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2383,7 +2396,7 @@ msgstr "" "Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott " "csomagok okozhatják." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "" "A problémák nem javíthatók, sérült visszafogott csomagok vannak a rendszeren." @@ -2400,12 +2413,12 @@ msgstr "%spartial archívumkönyvtár hiányzik." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "%li/%li fájl letöltése (%s marad)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:832 #, c-format msgid "Retrieving file %li of %li" msgstr "%li/%li fájl letöltése" @@ -2452,16 +2465,16 @@ msgstr "" 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 e hibákat" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Hibás rekord a tulajdonság fájlban, nincs csomagfejléc" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "A(z) %s tűtípus nem értelmezhető" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Nincs prioritás (vagy nulla) megadva a tűhöz" @@ -2554,15 +2567,15 @@ 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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "Az MD5Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is 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 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2571,7 +2584,7 @@ msgstr "" "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:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2580,14 +2593,14 @@ msgstr "" "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:848 +#: apt-pkg/acquire-item.cc:855 #, 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:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "A méret nem megfelelő" @@ -2641,11 +2654,16 @@ msgstr "Indexfájlok keresése a lemezen...\n" 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" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Tárolt címke: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "E név érvénytelen, próbáld újra.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2654,20 +2672,21 @@ msgstr "" "E lemez neve: \n" "%s\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Csomaglisták másolása..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Új forráslista írása\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "E lemezhez tartozó forráslista-bejegyzések a következők:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM leválasztása..." #: apt-pkg/indexcopy.cc:261 @@ -2744,21 +2763,8 @@ msgstr "%s teljesen eltávolítva" msgid "Connection closed prematurely" msgstr "A kapcsolat idő előtt lezárult" -#: 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/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n" - -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n" +#~ msgid "File date has changed %s" +#~ msgstr "A fájl dátuma megváltozott %s" #~ msgid "Total Distinct Descriptions: " #~ msgstr "Összes külső leírás: " @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" -"PO-Revision-Date: 2006-02-14 11:41+0100\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"PO-Revision-Date: 2006-10-12 09:27+0200\n" "Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n" "Language-Team: Italian <it@li.org>\n" "MIME-Version: 1.0\n" @@ -147,7 +147,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s per %s %s compilato il %s %s\n" @@ -426,115 +426,128 @@ msgstr "Nessuna selezione corrisponde" msgid "Some files are missing in the package file group `%s'" msgstr "Mancano alcuni file nel file group di pacchetti `%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB era corrotto, il file stato rinominato in %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Il DB vecchio, tentativo di aggiornamento %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"Il formato DB non valido. Se avete aggiornato da una vecchia versione di " +"apt,rimuovete e ricreate il database." + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Impossibile aprire il file DB %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "La data del file cambiata %s" +msgid "Failed to stat %s" +msgstr "Impossibile analizzare %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "L'archivio non ha un campo control" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Impossibile ottenere un cursore" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Impossibile leggere la directory %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Impossibile analizzare %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Errori applicati al file " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Impossibile risolvere %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Visita dell'albero fallita" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Impossibile aprire %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Impossibile eseguire readlink su %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Impossibile eseguire unlink su %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Impossibile eseguire link tra %s e %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limite di %sB raggiunto.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Impossibile analizzare %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "L'archivio non ha un campo package" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s non ha un campo override\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s maintainer %s non %s\n" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s non ha un campo source override\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s non ha neppure un campo binary override\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -798,11 +811,11 @@ msgstr "I pacchetti devono essere rimossi ma il remove disabilitato." msgid "Internal error, Ordering didn't finish" msgstr "Errore interno, l'ordinamento non terminato" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Impossibile creare un lock sulla directory di download" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "La lista dei sorgenti non pu essere letta." @@ -833,7 +846,7 @@ msgstr "Dopo l'estrazione, verranno occupati %sB di spazio su disco.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Dopo l'estrazione, verranno liberati %sB di spazio su disco.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossibile determinare lo spazio libero su %s" @@ -872,7 +885,7 @@ msgstr "Interrotto." msgid "Do you want to continue [Y/n]? " msgstr "Continuare [S/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile ottenere %s %s\n" @@ -881,7 +894,7 @@ msgstr "Impossibile ottenere %s %s\n" msgid "Some files failed to download" msgstr "Il download di alcuni file fallito" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Download completato e in modalit download-only" @@ -1057,109 +1070,109 @@ msgstr "Pacchetto non integro" msgid "The following extra packages will be installed:" msgstr "I seguenti pacchetti verranno inoltre installati:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Pacchetti suggeriti:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Pacchetti raccomandati:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento in corso... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Fallito" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Fatto" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "Errore interno, problem resolver ha rotto qualcosa" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "Bisogna specificare almeno un pacchetto di cui scaricare il sorgente" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossibile trovare un pacchetto sorgente per %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Si saltato il file gi scaricato '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s non sufficiente" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr " necessario prendere %sB/%sB di sorgenti.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr " necessario prendere %sB di sorgenti\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Prelievo del sorgente %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Non stato possibile scaricare alcuni archivi." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Si saltata l'estrazione del sorgente gi estratto in %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione '%s' fallito.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificare se il pacchetto 'dpkg-dev' installato.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando di costruzione '%s' fallito.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Processo figlio fallito" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" "Bisogna specificare almeno un pacchetto di cui controllare la generazione di " "dipendenze" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossibile ottenere informazioni di dipendenza di costruzione per %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di costruzione.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1168,7 +1181,7 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perch non si trova il " "pacchetto %s" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1177,32 +1190,32 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perch nessuna versione " "del pacchetto %s pu soddisfare le richieste di versione" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "La dipendenza %s per %s non stata soddisfatta: il pacchetto installato %s " " troppo nuovo" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s: %s fallita" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non stato possibile soddisfare le dipendenze di costruzione per %s." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Il calcolo delle dipendenze per la costruzione fallito" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Moduli supportati:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1390,19 +1403,19 @@ msgstr "Aggiornamento delle informazioni disponibili" msgid "Failed to create pipes" msgstr "Impossibile creare delle pipe" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Impossibile eseguire gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Archivio corrotto" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Checksum di tar fallito, archivio corrotto" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo %u nell'header del tar sconosciuto, member %s" @@ -1671,25 +1684,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "CD-ROM sbagliato" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Impossibile smontare il CD-ROM in %s, potrebbe essere ancora in uso." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disco non trovato" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "File non trovato" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Impossibile analizzare" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Impossibile impostare la data di modifica (modification time)" @@ -1818,7 +1831,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:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemi nella creazione dell'hash del file" @@ -1903,41 +1916,42 @@ msgstr " accaduto qualcosa di anormale nella risoluzione di '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "Impossibile connettersi a %s %s:" -#: methods/gpgv.cc:64 -#, fuzzy, c-format +#: methods/gpgv.cc:65 +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Impossibile risolvere '%s'" +msgstr "Impossibile accedere al keyring '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Lista argomento da Acquire::gpgv::Options troppo lunga. Uscita in corso." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Errore interno: Firma corretta, ma non stato possibile determinare il " "fingerprint della chiave?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Almeno una firma non valida stata trovata." -#: methods/gpgv.cc:207 -#, fuzzy, c-format +#: methods/gpgv.cc:213 +#, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr " per verificare la firma (gnupg installato?)" +msgstr "" +"Impossibile esseguire '%s' per verificare la firma (gnupg installato?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Errore sconosciuto durante l'esecuzione di gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Le seguenti firme non erano valide:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1945,87 +1959,87 @@ msgstr "" "Le seguenti firme non sono state verificate perch la chiave pubblica non " "disponibile:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Impossibile aprire una pipe per %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Errore di lettura dal processo %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "In attesa degli header" -#: methods/http.cc:522 +#: methods/http.cc:523 #, 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:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Linea nell'header non corretta" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Il server HTTP ha inviato un header di risposta non valido" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Il server HTTP ha inviato un Content-Length non valido" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Il server HTTP ha inviato un Content-Range non valido" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Questo server HTTP ha il supporto del range bacato" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Formato della data sconosciuto" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Select fallito" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Tempo limite per la connessione esaurito" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Errore nella scrittura del file di output" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:874 +#: methods/http.cc:875 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:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Errore nella lettura dal server" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Header dei dati malformato" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Connessione fallita" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Errore interno" @@ -2100,12 +2114,12 @@ msgstr "Errore di sintassi %s:%u: Direttiva non supportata '%s'" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Errore di sintassi %s:%u: caratteri extra alla fine del file" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Errore!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fatto" @@ -2321,12 +2335,12 @@ msgstr "Versioni candidate" msgid "Dependency generation" msgstr "Generazione delle dipendenze" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossibile analizzare il file dei pacchetti %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossibile analizzare il file dei pacchetti %s (2)" @@ -2405,7 +2419,7 @@ msgstr "" "Il pacchetto %s deve essere reinstallato, ma non si riesce a trovare un " "archivio per esso." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2413,7 +2427,7 @@ msgstr "" "Errore, pkgProblemResolver::Resolve ha generato uno stop, questo pu essere " "causato da pacchetti bloccati " -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "Impossibile correggere i problemi, ci sono pacchetti rotti bloccati" @@ -2429,15 +2443,15 @@ msgstr "Manca la directory di archivio %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:830 +#, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Scaricamento del file %li di %li (%s rimanente)" +msgstr "Scaricamento file %li di %li (%s rimanente)" -#: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:832 +#, c-format msgid "Retrieving file %li of %li" -msgstr "Lettura della lista dei file in corso" +msgstr "Scaricamento file %li di %li" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2483,16 +2497,16 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr " consigliabile eseguire apt-get update per correggere questi problemi" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Campo non valido nel file delle preferenze, Manca \"Package header\"" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Impossibile capire il tipo di pin %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Nessuna (o zero) priorit specificata per il pin" @@ -2587,16 +2601,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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "Somma MD5 non corrispondente" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is 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 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2606,7 +2620,7 @@ msgstr "" "che bisogna correggere manualmente l'errore. (a causa di un'architettura " "mancante)" -#: apt-pkg/acquire-item.cc:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2615,7 +2629,7 @@ msgstr "" "Non stato possibile trovare file per il pacchetto %s. Questo significa che " "bisogna correggere manualmente l'errore." -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2623,7 +2637,7 @@ msgstr "" "I file indice dei pacchetti sono corrotti. Non c' un campo Filename: per il " "pacchetto %s." -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Le Dimensioni non corrispondono" @@ -2677,11 +2691,16 @@ msgstr "Scansione del disco alla ricerca di file indice, in corso..\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Trovati %i indici di pacchetto, %i indici di sorgenti e %i firme\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Etichette salvate: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Questo non un nome valido, riprovare.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2690,20 +2709,21 @@ msgstr "" "Questo disco chiamato: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Copia della lista dei pacchetti in corso..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Scrittura di una nuova lista sorgenti in corso\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Le voci lista sorgenti per questo Disco sono:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "Smontaggio CD-ROM in corso..." #: apt-pkg/indexcopy.cc:261 @@ -2767,39 +2787,24 @@ msgid "Removed %s" msgstr "%s rimosso" #: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#, c-format msgid "Preparing to completely remove %s" -msgstr "Preparazione alla configurazione di %s in corso" +msgstr "Preparazione alla rimozione totale di %s in corso" #: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#, c-format msgid "Completely removed %s" -msgstr "Impossibile rimuovere %s" +msgstr "Rimozione totale completata %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connessione chiusa prematuramente" -#: 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/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s non ha un campo override\n" - -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s non ha un campo override\n" +#~ msgid "File date has changed %s" +#~ msgstr "La data del file è cambiata %s" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Impossibile aprire il file %s" +#~ msgid "Could not patch file" +#~ msgstr "Impossibile aprire il file %s" #~ msgid "Reading file list" #~ msgstr "Lettura della lista dei file in corso" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 16:17+0200\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" "PO-Revision-Date: 2006-09-08 19:57+0900\n" "Last-Translator: Kenshi Muto <kmuto@debian.org>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2380 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 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" @@ -440,7 +440,9 @@ msgstr "DB が古いため、%s のアップグレードを試みます" msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." -msgstr "DB フォーマットが無効です。apt の古いバージョンから更新したのであれば、データベースを削除・再作成してください。" +msgstr "" +"DB フォーマットが無効です。apt の古いバージョンから更新したのであれば、データ" +"ベースを削除・再作成してください。" #: ftparchive/cachedb.cc:81 #, c-format @@ -808,11 +810,11 @@ msgstr "パッケージを削除しなければなりませんが、削除が無 msgid "Internal error, Ordering didn't finish" msgstr "内部エラー、調整が終わっていません" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "ダウンロードディレクトリをロックできません" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2128 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "ソースのリストを読むことができません。" @@ -842,7 +844,7 @@ msgstr "展開後に追加で %sB のディスク容量が消費されます。\ msgid "After unpacking %sB disk space will be freed.\n" msgstr "展開後に %sB のディスク容量が解放されます。\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s の空き領域を測定できません" @@ -879,7 +881,7 @@ msgstr "中断しました。" 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:2025 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" @@ -888,7 +890,7 @@ msgstr "%s の取得に失敗しました %s\n" msgid "Some files failed to download" msgstr "いくつかのファイルの取得に失敗しました" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" @@ -1065,110 +1067,110 @@ msgstr "壊れたパッケージ" msgid "The following extra packages will be installed:" msgstr "以下の特別パッケージがインストールされます:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "提案パッケージ:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "推奨パッケージ:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "アップグレードパッケージを検出しています ... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "完了" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "内部エラー、問題リゾルバが何かを破壊しました" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "" "ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります" -#: cmdline/apt-get.cc:1917 cmdline/apt-get.cc:2146 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "%s のソースパッケージが見つかりません" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "すでにダウンロードされたファイル '%s' をスキップします\n" -#: cmdline/apt-get.cc:1985 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "%s に充分な空きスペースがありません" -#: cmdline/apt-get.cc:1990 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:1999 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "ソース %s を取得\n" -#: cmdline/apt-get.cc:2030 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "いくつかのアーカイブの取得に失敗しました。" -#: cmdline/apt-get.cc:2058 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" -#: cmdline/apt-get.cc:2070 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "展開コマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2071 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" "'dpkg-dev' パッケージがインストールされていることを確認してください。\n" -#: cmdline/apt-get.cc:2088 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "ビルドコマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "子プロセスが失敗しました" -#: cmdline/apt-get.cc:2123 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります" -#: cmdline/apt-get.cc:2151 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s のビルド依存情報を取得できません" -#: cmdline/apt-get.cc:2171 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s にはビルド依存情報が指定されていません。\n" -#: cmdline/apt-get.cc:2223 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1177,7 +1179,7 @@ msgstr "" "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと" "ができません" -#: cmdline/apt-get.cc:2275 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1186,32 +1188,32 @@ msgstr "" "入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対" "する %1$s の依存関係を満たすことができません" -#: cmdline/apt-get.cc:2310 +#: cmdline/apt-get.cc:2317 #, 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:2335 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s のビルド依存関係を満たすことができませんでした。" -#: cmdline/apt-get.cc:2353 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "ビルド依存関係の処理に失敗しました" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "サポートされているモジュール:" -#: cmdline/apt-get.cc:2426 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1675,25 +1677,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "CD が違います" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "%s の CD-ROM は使用中のためアンマウントすることができません。" -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "ディスクが見つかりません。" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "ファイルが見つかりません" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "状態の取得に失敗しました" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "変更時刻の設定に失敗しました" @@ -1821,7 +1823,7 @@ msgstr "データソケット接続タイムアウト" msgid "Unable to accept connection" msgstr "接続を accept できません" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "ファイルのハッシュでの問題" @@ -1926,7 +1928,9 @@ msgstr "少なくとも 1 つの不正な署名が発見されました。" #: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "署名を検証するための '%s' の実行ができませんでした (gnupg はインストールされていますか?)" +msgstr "" +"署名を検証するための '%s' の実行ができませんでした (gnupg はインストールされ" +"ていますか?)" #: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" @@ -1942,86 +1946,86 @@ msgid "" "available:\n" msgstr "公開鍵を利用できないため、以下の署名は検証できませんでした:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "%s に対してパイプを開けませんでした" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "%s プロセスからの読み込みエラー" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "ヘッダの待機中です" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "%u 文字を超える 1 行のヘッダを取得しました" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "不正なヘッダ行です" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "http サーバが不正なリプライヘッダを送信してきました" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http サーバが不正な Content-Length ヘッダを送信してきました" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http サーバが不正な Content-Range ヘッダを送信してきました" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "http サーバのレンジサポートが壊れています" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "不明な日付フォーマットです" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "select に失敗しました" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "接続タイムアウト" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "出力ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "サーバからの読み込みに失敗しました" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "不正なヘッダです" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "接続失敗" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "内部エラー" @@ -2094,12 +2098,12 @@ msgstr "文法エラー %s:%u: 未対応の命令 '%s'" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... エラー!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... 完了" @@ -2312,12 +2316,12 @@ msgstr "候補バージョン" msgid "Dependency generation" msgstr "依存関係の生成" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "パッケージファイル %s を解釈することができません (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "パッケージファイル %s を解釈することができません (2)" @@ -2396,7 +2400,7 @@ msgstr "" "パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見" "つけることができませんでした。" -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2404,7 +2408,7 @@ msgstr "" "エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー" "ジが原因です。" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。" @@ -2420,12 +2424,12 @@ msgstr "アーカイブディレクトリ %spartial が見つかりません。" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "ファイルを取得しています %li/%li (残り %s)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:832 #, c-format msgid "Retrieving file %li of %li" msgstr "ファイルを取得しています %li/%li" @@ -2477,18 +2481,18 @@ msgstr "" "これらの問題を解決するためには apt-get update を実行する必要があるかもしれま" "せん" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "" "不正なレコードが preferences ファイルに存在します。パッケージヘッダがありませ" "ん" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "pin タイプ %s が理解できませんでした" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "pin で優先度 (または 0) が指定されていません" @@ -2576,15 +2580,15 @@ msgstr "ソースキャッシュの保存中に IO エラーが発生しまし msgid "rename failed, %s (%s -> %s)." msgstr "名前の変更に失敗しました。%s (%s -> %s)" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "MD5Sum が適合しません" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2593,7 +2597,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2602,7 +2606,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります。" -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2610,7 +2614,7 @@ msgstr "" "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: " "フィールドがありません。" -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "サイズが適合しません" @@ -2666,11 +2670,16 @@ msgstr "" "%i のパッケージインデックス、%i のソースインデックス、%i の署名を見つけまし" "た\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "格納されたラベル: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "これは有効な名前ではありません。再試行してください。\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2679,20 +2688,21 @@ msgstr "" "このディスクは以下のように呼ばれます: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "パッケージリストをコピーしています ..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "新しいソースリストを書き込んでいます\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "このディスクのソースリストのエントリ:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM をアンマウントしています ..." #: apt-pkg/indexcopy.cc:261 @@ -1,18 +1,19 @@ -# translation of apt_po_km.po to
-# This file is put in the public domain.
-#
-# Eng Vannak <evannak@khmeros.info>, 2006.
-# Poch Sokun <sokun_poch@khmeros.info>, 2006.
-# auk piseth <piseth_dv@khmeros.info>, 2006.
-# Leang Chumsoben <soben@khmeros.info>, 2006.
+# translation of apt_po_km.po to Khmer +# translation of apt_po_km.po to +# This file is put in the public domain. +# +# Eng Vannak <evannak@khmeros.info>, 2006. +# Poch Sokun <sokun_poch@khmeros.info>, 2006. +# auk piseth <piseth_dv@khmeros.info>, 2006. +# Khoem Sokhem <khoemsokhem@khmeros.info>, 2006. msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" -"PO-Revision-Date: 2006-06-22 08:49+0700\n" -"Last-Translator: Leang Chumsoben <soben@khmeros.info>\n" -"Language-Team: <en@li.org>\n" +"POT-Creation-Date: 2006-10-11 20:34+0200\n" +"PO-Revision-Date: 2006-10-10 09:48+0700\n" +"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n" +"Language-Team: Khmer <support@khmeros.info>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -151,7 +152,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 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" @@ -426,115 +427,128 @@ msgstr "គ្មានការជ្រើសដែលផ្គ msgid "Some files are missing in the package file group `%s'" msgstr "ឯកសារមួយចំនួនបាត់បងពីក្រុមឯកសារកញ្ចប់ `%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB បានខូច, ឯកសារបានប្តូរឈ្មោះទៅជា %s.old ។" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB ចាស់, កំពុងព្យាយាមធ្វើឲ្យ %s ប្រសើរឡើង" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"ទ្រង់ទ្រាយមូលដ្ឋានទិន្នន័យមិនត្រឹមត្រូវ ។ ប្រសិនបើអ្នកបានធ្វើឲ្យវាប្រសើឡើងពីកំណែចាស់របស់ apt សូមយក" +"មូលដ្ឋានទិន្នន័យចេញ និងបង្កើតមូលដ្ឋានទិន្នន័យឡើងវិញ ។" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "មិនអាចបើកឯកសារ DB បានទេ %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "កាលបរិច្ឆេទឯកសារត្រូវបានប្តូរ %s" +msgid "Failed to stat %s" +msgstr "បានបរាជ័យក្នុងការថ្លែង %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "ប័ណ្ណសារគ្មានកំណត់ត្រាត្រួតពិនិត្យទេ" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "មិនអាចយកទស្សន៍ទ្រនិច" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: មិនអាចអានថត %s បានឡើយ\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W ៖ មិនអាចថ្លែង %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: កំហុសអនុវត្តលើឯកសារ" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "បរាជ័យក្នុងការដោះស្រាយ %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "មែកធាង បានបរាជ័យ" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "បរាជ័យក្នុងការបើក %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "បានបរាជ័យក្នុងការអានតំណ %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "បានបរាជ័យក្នុងការផ្ដាច់ %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** បានបរាជ័យក្នុងការត %s ទៅ %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink កំណត់នៃការវាយ %sB ។\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "បានបរាជ័យក្នុងការថ្លែង %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "ប័ណ្ណសារគ្មានវាលកញ្ចប់" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s គ្មានធាតុធាតុបញ្ចូលបដិសេធឡើយ\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " អ្នកថែទាំ %s គឺ %s មិនមែន %s\n" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s គ្មានធាតុបដិសេធប្រភព\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s គ្មានធាតុបដិសេធគោលពីរដែរ\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -795,11 +809,11 @@ msgstr "កញ្ចប់ ត្រូវការឲ្យយកច msgid "Internal error, Ordering didn't finish" msgstr "កំហុសខាងក្នុង ការរៀបតាមលំដាប់មិនបានបញ្ចប់ឡើយ" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "មិនអាចចាក់សោថតទាញយកបានឡើយ" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "មិនអាចអានបញ្ជីប្រភពបានឡើយ ។" @@ -828,7 +842,7 @@ msgstr "បន្ទាប់ពីពន្លា %sB នៃកា msgid "After unpacking %sB disk space will be freed.\n" msgstr "បន្ទាប់ពីពន្លា %sB ទំហំថាសនឹងទំនេរ ។ \n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "មិនអាចកំណត់ទំហំទំនេរក្នុង %s បានឡើយ" @@ -865,7 +879,7 @@ msgstr "បោះបង់ ។" msgid "Do you want to continue [Y/n]? " msgstr "តើអ្នកចង់បន្តឬ [បាទ ចាស/ទេ] ? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "បរាជ័យក្នុងការទៅប្រមូលយក %s %s\n" @@ -874,7 +888,7 @@ msgstr "បរាជ័យក្នុងការទៅប្រម msgid "Some files failed to download" msgstr "ឯកសារមួយចំនួនបានបរាជ័យក្នុងការទាញយក" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "បានបញ្ចប់ការទាញយក ហើយតែក្នុងរបៀបទាញយកប៉ុណ្ណោះ" @@ -1045,114 +1059,114 @@ msgstr "កញ្ចប់ដែលបានខូច" msgid "The following extra packages will be installed:" msgstr "កញ្ចប់បន្ថែមដូចតទៅនេះ នឹងត្រូវបានដំឡើង ៖" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "កញ្ចប់ដែលបានផ្ដល់យោបល់ ៖" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "កញ្ចប់ដែលបានផ្ដល់អនុសាសន៍ ៖" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "កំពុងគណនាការធ្វើឲ្យប្រសើរ... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "បានបរាជ័យ" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "ធ្វើរួច" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "កំហុសខាងក្នុង អ្នកដោះស្រាយបញ្ហាបានធ្វើឲ្យខូចឧបករណ៍" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "យ៉ាងហោចណាស់ត្រូវបញ្ជាក់កញ្ចប់មួយ ដើម្បីទៅប្រមូលយកប្រភពសម្រាប់" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "មិនអាចរកកញ្ចប់ប្រភពសម្រាប់ %s បានឡើយ" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "កំពុងរំលងឯកសារដែលបានទាញយករួច '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "អ្នកពុំមានទំហំទំនេរគ្រប់គ្រាន់ទេនៅក្នុង %s ឡើយ" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ត្រូវការយក %sB/%sB នៃប័ណ្ណសារប្រភព ។\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ត្រូវការយក %sB នៃប័ណ្ណសារប្រភព ។\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "ទៅប្រមូលប្រភព %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "បរាជ័យក្នុងការទៅប្រមូលយកប័ណ្ណសារមួយចំនួន ។" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "កំពុងរំលងការស្រាយនៃប្រភពដែលបានស្រាយរួចនៅក្នុង %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "ពាក្យបញ្ជាស្រាយ '%s' បានបរាជ័យ ។\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ពិនិត្យប្រសិនបើកញ្ចប់ 'dpkg-dev' មិនទាន់បានដំឡើង ។\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "សាងសងពាក្យបញ្ជា '%s' បានបរាជ័យ ។\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "ដំណើរការកូនបានបរាជ័យ" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "ត្រូវតែបញ្ជាក់យ៉ាងហោចណាស់មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "មិនអាចសាងសង់ព័ត៌មានភាពអស្រ័យសម្រាប់ %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s មិនមានភាពអាស្រ័យស្ថាបនាឡើយ ។\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, 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 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1161,30 +1175,30 @@ msgstr "" "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាចតម្រូវចិត្តបានទេ ព្រោះ មិនមានកំណែនៃកញ្ចប់ %s ដែលអាចតម្រូវចិត្ត" "តម្រូវការកំណែបានឡើយ" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "បរាជ័យក្នុងការតម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "បរាជ័យក្នុងការតម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ភាពអាស្រ័យដែលបង្កើត %s មិនអាចបំពេញសេចក្ដីត្រូវការបានទេ ។" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "បានបរាជ័យក្នុងការដំណើរការបង្កើតភាពអាស្រ័យ" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "ម៉ូឌុលដែលគាំទ្រ ៖ " -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1363,19 +1377,19 @@ msgstr "បញ្ចូលព័ត៌មានដែលមានច msgid "Failed to create pipes" msgstr "បានបរាជ័យក្នុងការបង្កើតបំពង់" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "បានបរាជ័យក្នុងការប្រតិបត្តិ gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "ប័ណ្ណសារបានខូច" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar ឆេកសាំបានបរាជ័យ ប័ណ្ណសារបានខូច" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "មិនស្គាល់ប្រភេទបឋមកថា TAR %u ដែលជាសមាជិក %s" @@ -1654,12 +1668,12 @@ msgstr "រកថាសមិនឃើញ ។" msgid "File not found" msgstr "រកឯកសារមិនឃើញ" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "បរាជ័យក្នុងការថ្លែង" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "បរាជ័យក្នុងការកំណត់ពេលវេលាការកែប្រែ" @@ -1870,49 +1884,49 @@ msgstr "ការដោះស្រាយអ្វីអាក្រក msgid "Unable to connect to %s %s:" msgstr "មិនអាចតភ្ជាប់ទៅកាន់ %s %s ៖" -#: methods/gpgv.cc:64 -#, fuzzy, c-format +#: methods/gpgv.cc:65 +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "មិនអាចដោះស្រាយ '%s' បានឡើយ" +msgstr "មិនអាចចូលដំណើរការ keyring ៖ '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E ៖ បញ្ជីអាគុយម៉ង់ពី Acquire::gpgv::Options too long ។ ចេញ ។" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "កំហុសខាងក្នុង ៖ ហត្ថលេខាល្អ ប៉ុន្តែ មិនអាចកំណត់កូនសោស្នាមម្រាមដៃ ?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "បានជួបប្រទះហត្ថលេខាយ៉ាងហោចណាស់មួយ ដែលត្រឹមត្រូវ ។" -#: methods/gpgv.cc:207 -#, fuzzy, c-format +#: methods/gpgv.cc:213 +#, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr " ដើម្បីពិនិត្យហត្ថលេខា ( gnupg បានដំឡើងឬអត់ ?)" +msgstr "មិនអាចប្រតិបត្តិ '%s' ដើម្បីផ្ទៀងផ្ទាត់ហត្ថលេខា (តើ gnupg ត្រូវបានដំឡើងឬនៅ ?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "ហត្ថលេខាខាងក្រោមមិនត្រឹមត្រូវ ៖\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "ហត្ថលេខាខាងក្រោមមិនអាចផ្ទៀងផ្ទាត់បានទេ ព្រោះកូនសោសាធារណៈមិនអាចប្រើបាន ៖\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "មិនអាចបើកបំពុងសម្រាប់ %s បានឡើយ" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "អាចនកំហុសពីដំណើរការ %s" @@ -2277,12 +2291,12 @@ msgstr "កំណែសាកល្បង" msgid "Dependency generation" msgstr "ការបង្កើតភាពអាស្រ័យ" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "មិនអាចញែកឯកសារកញ្ចប់ %s (1) បានឡើយ" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "មិនអាចញែកឯកសារកញ្ចប់ %s (2) បានឡើយ" @@ -2384,14 +2398,14 @@ msgstr "ថតប័ណ្ណសារ %spartial គឺបាត់ប #. only show the ETA if it makes sense #. two days #: apt-pkg/acquire.cc:823 -#, fuzzy, c-format +#, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "កំពុងទាញយកឯកសារ %li នៃ %li (%s នៅសល់)" +msgstr "កំពុងទៅយកឯកសារ %li នៃ %li (នៅសល់ %s)" #: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#, c-format msgid "Retrieving file %li of %li" -msgstr "កំពុងអានបញ្ជីឯកសារ" +msgstr "កំពុងទៅយកឯកសារ %li នៃ %li" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2536,7 +2550,7 @@ msgid "MD5Sum mismatch" msgstr "MD5Sum មិនផ្គួផ្គង" #: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +msgid "There is no public key available for the following key IDs:\n" msgstr "គ្មានកូនសោសាធារណៈអាចរកបានក្នុងកូនសោ IDs ខាងក្រោមនេះទេ ៖\n" #: apt-pkg/acquire-item.cc:753 @@ -2706,27 +2720,15 @@ msgid "Removed %s" msgstr "បានយក %s ចេញ" #: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#, c-format msgid "Preparing to completely remove %s" -msgstr "កំពុងរៀបចំកំណត់រចនាសម្ព័ន្ធ %s" +msgstr "កំពុងរៀបចំយក %s ចេញទាំងស្រុង" #: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#, c-format msgid "Completely removed %s" -msgstr "បរាជ័យក្នុងការយក %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" @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" -"PO-Revision-Date: 2006-07-20 00:28+0900\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"PO-Revision-Date: 2006-10-12 21:22-0400\n" "Last-Translator: Sunjae Park <darehanl@gmail.com>\n" "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -146,7 +146,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s (%s %s), 컴파일 시각 %s %s\n" @@ -421,117 +421,130 @@ msgstr "맞는 꾸러미가 없습니다" msgid "Some files are missing in the package file group `%s'" msgstr "`%s' 꾸러미 파일 그룹에 몇몇 파일이 빠졌습니다" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB가 망가졌습니다. 파일 이름을 %s.old로 바꿉니다" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB가 오래되었습니다. %s의 업그레이드를 시도합니다" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"DB 형식이 잘못되었습니다. apt 예전 버전에서 업그레이드했다면, 데이터베이스를 " +"지우고 다시 만드십시오." + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "DB 파일, %s 파일을 열 수 없습니다: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "%s 파일의 마지막 수정 시각이 바뀌엇습니다" +msgid "Failed to stat %s" +msgstr "%s의 정보를 읽는 데 실패했습니다" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "아카이브에 컨트롤 기록이 없습니다" # FIXME: 왠 커서?? -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "커서를 가져올 수 없습니다" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "경고: %s 디렉토리를 읽을 수 없습니다\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "경고: %s의 정보를 읽을 수 없습니다\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "오류: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "경고: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "오류: 다음 파일에 적용하는 데 오류가 발생했습니다: " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "%s의 경로를 알아내는 데 실패했습니다" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "트리에서 이동이 실패했습니다" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "%s 파일을 여는 데 실패했습니다" # FIXME: ?? -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " 링크 %s [%s] 없애기\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "%s 파일에 readlink하는 데 실패했습니다" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "%s 파일을 지우는 데 실패했습니다" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s 파일을 %s(으)로 링크하는 데 실패했습니다" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "%s의 정보를 읽는 데 실패했습니다" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "아카이브에 꾸러미 필드가 없습니다" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s에는 override 항목이 없습니다\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 관리자가 %s입니다 (%s 아님)\n" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s에는 source override 항목이 없습니다\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s에는 binary override 항목이 없습니다\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -793,11 +806,11 @@ msgstr "꾸러미를 지워야 하지만 지우기가 금지되어 있습니다. msgid "Internal error, Ordering didn't finish" msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "내려받기 디렉토리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "소스 목록을 읽을 수 없습니다." @@ -828,7 +841,7 @@ msgstr "압축을 풀면 %s바이트의 디스크 공간을 더 사용하게 됩 msgid "After unpacking %sB disk space will be freed.\n" msgstr "압축을 풀면 %s바이트의 디스크 공간이 비워집니다.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다" @@ -868,7 +881,7 @@ msgstr "중단." msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는 데 실패했습니다 %s\n" @@ -877,7 +890,7 @@ msgstr "%s 파일을 받는 데 실패했습니다 %s\n" msgid "Some files failed to download" msgstr "일부 파일을 받는 데 실패했습니다" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "내려받기를 마쳤고 내려받기 전용 모드입니다" @@ -1050,107 +1063,107 @@ msgstr "망가진 꾸러미" msgid "The following extra packages will be installed:" msgstr "다음 꾸러미를 더 설치할 것입니다:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "제안하는 꾸러미:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "추천하는 꾸러미:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "실패" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "완료" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "내부 오류, 문제 해결 프로그램이 사고쳤습니다" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소스 꾸러미를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는 데 실패했습니다." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' 꾸러미가 설치되었는지를 확인해주십시오.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 꾸러미를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1159,7 +1172,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1168,32 +1181,32 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 꾸러미가 너" "무 최근 버전입니다" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는 데 실패했습니다" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "지원하는 모듈:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1373,19 +1386,19 @@ msgstr "이용 가능 꾸러미 정보를 합칩니다" msgid "Failed to create pipes" msgstr "파이프 만들기가 실패했습니다" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "gzip 실행이 실패했습니다" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "아카이브가 손상되었습니다" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "tar 체크섬 실패, 아카이브가 손상되었습니다" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "알 수 없는 TAR 헤더 타입 %u, 멤버 %s" @@ -1651,25 +1664,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "잘못된 CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "%s 안의 CD-ROM을 마운트 해제할 수 없습니다. 사용 중일 것입니다." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." -msgstr "디스크가 없습니다" +msgstr "디스크가 없습니다." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 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 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "파일 정보를 읽는 데 실패했습니다" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "파일 변경 시각을 설정하는 데 실패했습니다" @@ -1797,7 +1810,7 @@ msgstr "데이터 소켓 연결 시간 초과" msgid "Unable to accept connection" msgstr "연결을 받을 수 없습니다" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "파일 해싱에 문제가 있습니다" @@ -1881,123 +1894,123 @@ msgstr "'%s:%s'의 주소를 알아내는 데 무언가 이상한 일이 발생 msgid "Unable to connect to %s %s:" msgstr "%s %s에 연결할 수 없습니다:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "키링에 접근할 수 없습니다: '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Acquire::gpgv::Options의 인자 목록이 너무 깁니다. 종료하는 중." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "내부 오류: 서명은 올바르지만 키 지문을 확인할 수 없습니다!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "최소한 하나 이상의 서명이 잘못되었습니다." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "서명을 인증하기 위한 '%s'를 실행할 수 없습니다(gnupg가 설치됐나요?)" +msgstr "서명을 인증하기 위한 '%s' 실행할 수 없습니다(gnupg가 설치됐나요?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "gpgv 실행 도중 알 수 없는 오류 발생" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "다음 서명이 올바르지 않습니다:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "다음 서명들은 공개키가 없기 때문에 인증할 수 없습니다:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "%s에 대한 파이프를 열 수 없습니다" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "헤더를 기다리는 중입니다" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "헤더 줄이 잘못되었습니다" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "데이터 형식을 알 수 없습니다" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "select가 실패했습니다" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "연결 시간이 초과했습니다" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "출력 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "해당 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "서버에서 읽는 데 오류가 발생했습니다" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "헤더 데이터가 잘못되었습니다" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "연결이 실패했습니다" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "내부 오류" @@ -2070,12 +2083,12 @@ msgstr "문법 오류 %s:%u: 지원하지 않는 지시어 '%s'" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... 오류!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... 완료" @@ -2288,12 +2301,12 @@ msgstr "후보 버전" msgid "Dependency generation" msgstr "의존성 만들기" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "꾸러미 파일 %s 파일을 파싱할 수 없습니다 (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "꾸러미 파일 %s 파일을 파싱할 수 없습니다 (2)" @@ -2371,7 +2384,7 @@ msgid "" msgstr "" "%s 꾸러미를 다시 설치해야 하지만, 이 꾸러미의 아카이브를 찾을 수 없습니다." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2379,7 +2392,7 @@ msgstr "" "오류, pkgProblemResolver::Resolve가 망가졌습니다, 고정 꾸러미때문에 발생할 수" "도 있습니다." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "문제를 바로잡을 수 없습니다, 망가진 고정 꾸러미가 있습니다." @@ -2395,12 +2408,12 @@ msgstr "아카이브 디렉토리 %spartial이 빠졌습니다." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "파일 받아오는 중: %2$li 중 %1$li (%3$s 남았음)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:832 #, c-format msgid "Retrieving file %li of %li" msgstr "파일 받아오는 중: %2$li 중 %1$li" @@ -2419,7 +2432,7 @@ msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다" #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -"'%2$s' 드라이브에 '%1$s'로 표기된 디스크를 삽입하고 엔터를 눌러주십시오." +"'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 삽입하고 엔터를 눌러주십시오." #: apt-pkg/init.cc:120 #, c-format @@ -2447,16 +2460,16 @@ msgstr "꾸러미 목록이나 상태 파일을 파싱할 수 없거나 열 수 msgid "You may want to run apt-get update to correct these problems" msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습니다." -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "기본 설정 파일에 잘못된 데이터가 있습니다. 꾸러미 헤더가 없습니다" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "핀 타입 %s이(가0 무엇인지 이해할 수 없습니다" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다" @@ -2501,15 +2514,15 @@ 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 @@ -2544,15 +2557,15 @@ msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다 msgid "rename failed, %s (%s -> %s)." msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "MD5Sum이 맞지 않습니다" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "다음 키 ID의 공개키가 없습니다:\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2561,7 +2574,7 @@ msgstr "" "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2570,14 +2583,14 @@ msgstr "" "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다." -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다." -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "크기가 맞지 않습니다" @@ -2631,11 +2644,16 @@ msgstr "디스크에서 색인 파일을 찾는 중입니다...\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "꾸러미 색인 %i개, 소스 색인 %i개, 시그너처 %i개 발견\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "저장된 레이블: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "올바른 이름이 아닙니다. 다시 시도하십시오.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2644,20 +2662,21 @@ msgstr "" "이 디스크는 다음과 같습니다: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "꾸러미 목록을 복사하는 중입니다..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "새 소스 리스트를 쓰는 중입니다\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM을 마운트 해제하는 중입니다..." #: apt-pkg/indexcopy.cc:261 @@ -2734,31 +2753,14 @@ msgstr "%s을(를) 완전히 지웠습니다" msgid "Connection closed prematurely" msgstr "연결이 너무 빨리 끊어졌습니다" -#: ftparchive/cachedb.cc:76 -msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " -"remove and re-create the database." -msgstr "" - -#: ftparchive/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s에는 override 항목이 없습니다\n" - -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s에는 override 항목이 없습니다\n" +#~ msgid "File date has changed %s" +#~ msgstr "%s 파일의 마지막 수정 시각이 바뀌엇습니다" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "%s 파일을 열 수 없습니다" +#~ msgid "Could not patch file" +#~ msgstr "%s 파일을 열 수 없습니다" #~ msgid "Reading file list" #~ msgstr "파일 목록을 읽는 중" -#, fuzzy #~ msgid "Could not execute " #~ msgstr "%s 잠금 파일을 얻을 수 없습니다" - diff --git a/po/makefile b/po/makefile index 45e5b1e5a..07dc51c07 100644 --- a/po/makefile +++ b/po/makefile @@ -40,6 +40,9 @@ $(POTFILES) : $(PO)/%.pot : --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot rm -f $(PO)/POTFILES_$*.in $(MSGCOMM) --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@ + # copy into the domain dirs to make rosetta happy + rm -f $(PO)/domains/$*/*.pot + cp $@ $(PO)/domains/$* $(PACKAGE)-all.pot: $(POTFILES) $(MSGCOMM) --more-than=0 $(POTFILES) --output=$@ diff --git a/po/mr.po b/po/mr.po new file mode 100644 index 000000000..e3aaf80ff --- /dev/null +++ b/po/mr.po @@ -0,0 +1,2799 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: apt\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-12-19 11:37+0100\n" +"PO-Revision-Date: 2006-08-09 16:17+0200\n" +"Last-Translator: Priti Patil <prithisd@gmail.com>\n" +"Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " +"<janabhaaratii@cdacmumbai.in>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\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 "दृतिका सिंक नाही,पॅकेज संचिका क्ष-संदर्भ करता येत नाही" + +#: 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 +#, fuzzy, c-format +#| msgid "%4i %s\n" +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:2387 cmdline/apt-sortpkgs.cc:144 +#, fuzzy, c-format +msgid "%s %s for %s %s compiled on %s %s\n" +msgstr "%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 "" +"उपयोग:अॅप्ट-कॅश(पर्याय) आज्ञा\n" +" अॅप्ट-कॅश(पर्याय) मिळवा संचिका १[संचिका २.... ]\n" +" अॅप्ट-कॅश (पर्याय )दाखवा pkg1 [pkg2 ...]\n" +"अॅप्ट कॅश (पर्याय) दाखवाsrc pkg1 [pkg2 ...]\n" +"\n" +"च्याAPT चे द्वयंक कॅश संचिता कौशल्याने हाताळण्यासाठी अॅप्ट -कॅश हे निम्नस्तरीय साधन आहे।\n" +"कॅश संचिका व त्यातील माहितीसाठी पृच्छा करा\n" +"\n" +"आज्ञावली\n" +" मिळवा-उगमस्थान कॅशमध्ये एक पॅकेज संचिका मिळवा \n" +"जेन कॅशेस-पॅकेज व उगमस्थान कॅश या दोघांची बांधणी करा\n" +"शो पॅकेज-एकमेव पॅकेजसाठी काही सामान्य माहिती दाखवा\n" +"शोएसआरसी-उगमस्थानाचा माहितीसंच दाखवा\n" +" स्टॅट्स-काही पायाभूत आकडेवारी दाखवा\n" +"डंप -संपूर्ण संचिका थोडक्यात दाखवा\n" +"डंप अॅव्हेल-स्टंॅड आऊटसाठी उपलब्ध संचिका छापा\n" +"अनमेट- न आठवलेली परावलंबने दाखवा\n" +"शोधा-regex नमुन्यासाठी पॅकेजची यादी शोधा\n" +"दाखवा -पॅकेजसाठी वाचनीय माहितीसंच दाखवा\n" +"अवलंबित -पॅकेजसाठी संस्करणपूर्व परावलंबन माहिती दाखवा\n" +"अतिअवलंबित -पॅकेजसाठी अतिपरावलंबन माहिती दाखवा\n" +" पॅकेज नावे- सर्व पॅकेजेससाठी यादी तयार करा\n" +"डॉटी-ग्राफ व्हिससाठी पॅकेज आलेलं निर्माण करा\n" +"xvcg-xvcg साठी पॅकेज आलेलं निर्माण करा\n" +"धोरण -धोरण निर्धारणे दाखवा\n" +"\n" +"पर्याय : \n" +"-h -हा साह्याकारी मजकूर\n" +"-p=? पॅकेज कॅश \n" +"-s=? उगमस्थान कॅश \n" +"-q-प्रगतीनिदर्शक अकार्यान्वित करा \n" +"-i -न आढळलेल्या आज्ञेसाठी महत्त्वाचे विभाग दाखवा\n" +"-c=? ही संरचना संचिका वाचा\n" +"-o=? एखादा अहेतूक संरचना पर्याय निर्धारित करा उदा --o dir::cache=/tmp\n" +"अधिक माहितीसाठी मार्गदर्शन पुस्तिकेचा अॅप्ट-कॅश(८) व अॅप्ट -कॉन्फ(५) ही पृष्ठे पहा \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 +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 "चलितमूल्य जोडीने नाहीत" + +#: 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 "" +"उपयोग : अॅप्ट-कॉन्फिग(पर्याय) आज्ञा \n" +"\n" +"अॅप्ट कन्फिग संचिता वाचण्यासाठी अॅप्ट-कन्फिग हे एक साधन आहे\n" +"\n" +"आज्ञावली : \n" +"शेल - शेल मोड \n" +"डंप - संरचना दाखवा \n" +"\n" +"पर्याय : \n" +" -h हा साह्याकारी मजकूर \n" +" -c= ? ही संरचना संचिका वाचा \n" +" -o=? एखदा अहेतुक संरचना पर्याय निर्धारित करा, उदा।eg -o dir::cache=/tmp\n" + +#: cmdline/apt-extracttemplates.cc:98 +#, c-format +msgid "%s not a valid DEB package." +msgstr "%s हे वैध डीईबी पॅकेज नाही " + +#: 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 "" +"उपयोग : अॅप्ट - एक्स्ट्रॅक्ट टेंप्लेट्स संचिका १[संचिका २..... ]\n" +" \n" +"अॅप्ट- एक्स्टॅक्ट टेंम्प्लेट्स हे संरचना व नमुन्याची माहिती काढण्याचे साधन आहे \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 +#, fuzzy +#| 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 -c=? Read this " +#| "configuration file\n" +#| " -o=? Set an arbitrary configuration option" +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 "" +"उपयोग : अॅप्ट -एफटीपीआरकाईव्ह (पर्याय) आज्ञावली \n" +" आज्ञावली : पॅकेजेस द्वयंकमार्ग [ओव्हरराईड फाईल] [मार्ग उपसर्ग]\n" +"उगमस्थान srcpath [ओव्हरराईड फाईल][मार्ग उपसर्ग]\n" +"मजकूर मार्ग \n" +"मोचन मार्ग \n" +"संरचना(गट) निर्माण करा\n" +" स्वच्छ संरचना \n" +"\n" +"अॅप्ट- एफटीपी फाईल संच डेबियन फाईलसंचासाठी अनुक्रम संचिका निर्माण करतो.तो\n" +" dpkg स्कॅन पॅकेजेस व dpkg स्कॅनपॅकेजेस करतो.संपूर्ण स्वंयंचलित ते कार्याकारी बदल\n" +" करण्यासाठी अनेक शैलींची निर्मिती करण्यास पुष्टि देतो\n" +"\n" +"अॅप्ट-एफटीपी फाईलसंच डेब्जच्या तरुरचनेपासून पॅकेज संचिका निर्माण करतो \n" +"पॅकेज संचिकेमध्ये प्रत्येक पॅकेज तसेच एमडी५ हॅश व संचिकाआकारामधील सर्व \n" +" नियंत्रक क्षेत्रांची माहिती असते.अग्रक्रम आणि विभाग यांच्या मूल्यांचा प्रभाव \n" +"वाढविण्यासाठी ओव्हरराईड संचिकेला पुष्टि दिलेली असते \n" +"\n" +"तसेच अॅप्ट-एफटीपी फाईलसंच dscs च्या तरूरचनेपासून उगमस्थान संचिका निर्माण करतो \n" +" उगमस्थान - ओव्हरराईड पर्यायाचा उपयोग एखाद्या src ओव्हरराईड संचिका नेमकेपणाने " +"दाखविण्यास होतो \n" +"\n" +"'पॅकेजेस' आणि 'उगमस्थान' आज्ञावली तरूरचनेच्या मुळाशी दिल्या जाव्यात \n" +"द्वयंक मार्गाचा निर्देश पुनरावर्ती शोधाच्या पाऱ्याकडे केलेला असावा आणि \n" +" ओव्हरराईड संचिकेमध्ये ओव्हरराईड संकेत (फ्लॅग्ज) असावेत आणि \n" +" संचिकानामक्षेत्रे असल्यास मार्ग उपसर्ग त्यांना जोडलेले असावेत.\n" +"डेबियन फाईलसंचामधील नमुन्यादाखल उपयोग : \n" +"अॅप्ट-एफटीपी फाईलसंच पॅकेजेस डिस्ट्स/पोटॅटो/मेन/द्वयंक-३८६/>\\\n" +"डिस्ट्स/पोटॅटो/मेन/द्वयंक- ३८६/पॅकेजेस \n" +"\n" +"पर्याय : \n" +" -h हा साह्याकारी मजकूर \n" +"--md5 MD5 ची निर्मिती नियंत्रित करा \n" +" -s= उगमस्थान ओव्हरराईड संचिका \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 +#, fuzzy, c-format +#| msgid "Some files are missing in the package file group '%s'" +msgid "Some files are missing in the package file group `%s'" +msgstr "%s पॅकेज संचिका समुहातील काही संचिका सापडत नाही" + +#: ftparchive/cachedb.cc:47 +#, fuzzy, c-format +#| msgid "DB was corrupted, file renamed to %s.old" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "DB खराब झाली होती,संचिका %s जुने म्हणून पुनर्नामांकित केली" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "DB जुने आहे,%s पुढच्या आवृतीसाठी प्रयत्न करत आहे" + +#: 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 "" +"DB स्वरुप वैध नाही. जर तुम्ही apt च्या जुन्या आवृत्तीपासून पुढिल आवृत्तीकृत करत असाल तर, " +"कृपया माहितीसंच काढून टाका आणि पुनर्निर्मित करा" + +#: ftparchive/cachedb.cc:81 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "%s: %s DB संचिका उघडण्यास असमर्थ" + +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#, c-format +msgid "Failed to stat %s" +msgstr "%s स्टेट करण्यास असमर्थ" + +#: ftparchive/cachedb.cc:242 +msgid "Archive has no control record" +msgstr "अर्काईव्ह मध्ये नियंत्रण माहिती संच नाही" + +#: ftparchive/cachedb.cc:448 +msgid "Unable to get a cursor" +msgstr "संकेतक घेण्यास असमर्थ" + +#: ftparchive/writer.cc:79 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "धोक्याची सूचना:%s संचयिका वाचण्यास असमर्थ \n" + +#: ftparchive/writer.cc:84 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "धो.सू.:%s स्टेट करण्यास असमर्थ\n" + +#: ftparchive/writer.cc:135 +msgid "E: " +msgstr "E:" + +#: ftparchive/writer.cc:137 +msgid "W: " +msgstr "धो.सू.:" + +#: ftparchive/writer.cc:144 +msgid "E: Errors apply to file " +msgstr "ई: संचिकेला लागू होणाऱ्या चुका" + +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#, c-format +msgid "Failed to resolve %s" +msgstr "%s सोडवण्यास असमर्थ" + +#: ftparchive/writer.cc:173 +msgid "Tree walking failed" +msgstr "ट्री चालणे असमर्थ" + +#: ftparchive/writer.cc:198 +#, c-format +msgid "Failed to open %s" +msgstr "%s उघडण्यास असमर्थ" + +#: ftparchive/writer.cc:257 +#, c-format +msgid " DeLink %s [%s]\n" +msgstr "%s [%s] डी दुवा\n" + +#: ftparchive/writer.cc:265 +#, c-format +msgid "Failed to readlink %s" +msgstr "%s वाचणारा दुवा असमर्थ" + +#: ftparchive/writer.cc:269 +#, c-format +msgid "Failed to unlink %s" +msgstr "%s दुवा काढण्यास असमर्थ" + +#: ftparchive/writer.cc:276 +#, c-format +msgid "*** Failed to link %s to %s" +msgstr "%s चा %s दुवा साधण्यास असमर्थ" + +#: ftparchive/writer.cc:286 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr "%sB हीट ची डिलींक मर्यादा\n" + +#: ftparchive/writer.cc:390 +msgid "Archive had no package field" +msgstr "अर्काईव्ह ला पॅकेज जागा नाही" + +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#, c-format +msgid " %s has no override entry\n" +msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n" + +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#, c-format +msgid " %s maintainer is %s not %s\n" +msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n" + +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n" + +#: ftparchive/contents.cc:317 +#, c-format +msgid "Internal error, could not locate member %s" +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 "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1" + +#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#, c-format +msgid "Malformed override %s line %lu #2" +msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #2" + +#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#, c-format +msgid "Malformed override %s line %lu #3" +msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #3" + +#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#, c-format +msgid "Failed to read the override file %s" +msgstr "%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 "उपक्रियेचा आयपीसी वाहिनी तयार करण्यास असमर्थ" + +#: ftparchive/multicompress.cc:198 +msgid "Failed to create FILE*" +msgstr "संचिका * तयार करण्यास असमर्थ" + +#: ftparchive/multicompress.cc:201 +msgid "Failed to fork" +msgstr "नविन प्रक्रिया(प्रोसेस) निर्माण करण्यास असमर्थ" + +#: ftparchive/multicompress.cc:215 +msgid "Compress child" +msgstr "चॉईल्ड(प्रोसेस)ला संकलित करा" + +#: ftparchive/multicompress.cc:238 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "अंतर्गत त्रुटी, %s तयार करण्यास असमर्थ" + +#: ftparchive/multicompress.cc:289 +msgid "Failed to create subprocess IPC" +msgstr "आयपीसी उपक्रिया तयार करण्यास असमर्थ" + +#: ftparchive/multicompress.cc:324 +msgid "Failed to exec compressor " +msgstr "दाबक(संकलितकर्ता) कर्यान्वित करण्यास असमर्थ" + +#: ftparchive/multicompress.cc:363 +msgid "decompressor" +msgstr "असंकलितकर्ता " + +#: ftparchive/multicompress.cc:406 +msgid "IO to subprocess/file failed" +msgstr "IO ची उपक्रिया/संचिका असमर्थ " + +#: 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 "होय" + +#: 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 संस्थापना' प्रोग्राम चालू करावा लागेल." + +#: 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 "पडताळून पाहिल्याशिवाय ही पॅकेजेस संस्थापित करायची का [हो/नाही]?" + +#: 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 "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला" + +#: cmdline/apt-get.cc:755 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "अंतर्गत त्रुटी, तुटलेल्या पॅकेजेस बरोबर संस्थापित पॅकेजला आवाहन केले गेले/बोलावले गेले!" + +#: 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 "अंतर्गत त्रुटी,क्रम अजून संपला नाही" + +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +msgid "Unable to lock the download directory" +msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ" + +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 +#: 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:1989 +#, 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 "क्षुल्लक फक्त निर्देशित केले आहे पण हे क्षुल्लक कृति/ऑपरेशन नाही." + +#: 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:2032 +#, fuzzy, c-format +msgid "Failed to fetch %s %s\n" +msgstr "%s घेण्यासाठी नाकाम\n" + +#: cmdline/apt-get.cc:979 +msgid "Some files failed to download" +msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ" + +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +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 रन करुन अद्ययावत करा किंवा --fix- " +"बरोबर प्रयत्न कराहरवलेले/गहाळ?" + +#: cmdline/apt-get.cc:990 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "" +"--fix- सापडत नाही आणि माध्यम/मिडिया अदलाबदल हे सध्या तांत्रिक मदत देऊ शकत नाही" + +#: 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 "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही." + +#: 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 "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले" + +#: 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" +"किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील." + +#: 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:1692 +msgid "Suggested packages:" +msgstr "सुचवलेली पॅकेजेस:" + +#: cmdline/apt-get.cc:1693 +msgid "Recommended packages:" +msgstr "शिफारस केलेली पॅकेजेस:" + +#: cmdline/apt-get.cc:1713 +msgid "Calculating upgrade... " +msgstr "पुढिल आवृत्तीची गणती करीत आहे..." + +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +msgid "Failed" +msgstr "असमर्थ" + +#: cmdline/apt-get.cc:1721 +msgid "Done" +msgstr "झाले" + +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +msgid "Internal error, problem resolver broke stuff" +msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले" + +#: cmdline/apt-get.cc:1894 +msgid "Must specify at least one package to fetch source for" +msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे" + +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#, c-format +msgid "Unable to find a source package for %s" +msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे" + +#: cmdline/apt-get.cc:1968 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n" + +#: cmdline/apt-get.cc:1992 +#, c-format +msgid "You don't have enough free space in %s" +msgstr "%s मध्ये पुरेशी जागा नाही" + +#: cmdline/apt-get.cc:1997 +#, c-format +msgid "Need to get %sB/%sB of source archives.\n" +msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n" + +#: cmdline/apt-get.cc:2000 +#, c-format +msgid "Need to get %sB of source archives.\n" +msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n" + +#: cmdline/apt-get.cc:2006 +#, c-format +msgid "Fetch source %s\n" +msgstr "%s उगम घ्या\n" + +#: cmdline/apt-get.cc:2037 +msgid "Failed to fetch some archives." +msgstr "काही अर्काईव्हज आणण्यास असमर्थ." + +#: cmdline/apt-get.cc:2065 +#, c-format +msgid "Skipping unpack of already unpacked source in %s\n" +msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n" + +#: cmdline/apt-get.cc:2077 +#, c-format +msgid "Unpack command '%s' failed.\n" +msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n" + +#: cmdline/apt-get.cc:2078 +#, c-format +msgid "Check if the 'dpkg-dev' package is installed.\n" +msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n" + +#: cmdline/apt-get.cc:2095 +#, c-format +msgid "Build command '%s' failed.\n" +msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n" + +#: cmdline/apt-get.cc:2114 +msgid "Child process failed" +msgstr "चाईल्ड प्रक्रिया अयशस्वी" + +#: cmdline/apt-get.cc:2130 +msgid "Must specify at least one package to check builddeps for" +msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे" + +#: cmdline/apt-get.cc:2158 +#, c-format +msgid "Unable to get build-dependency information for %s" +msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ" + +#: cmdline/apt-get.cc:2178 +#, c-format +msgid "%s has no build depends.\n" +msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n" + +#: cmdline/apt-get.cc:2230 +#, 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:2282 +#, 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:2317 +#, fuzzy, c-format +msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" +msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज पण नवीन आहे" + +#: cmdline/apt-get.cc:2342 +#, c-format +msgid "Failed to satisfy %s dependency for %s: %s" +msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s" + +#: cmdline/apt-get.cc:2356 +#, c-format +msgid "Build-dependencies for %s could not be satisfied." +msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही." + +#: cmdline/apt-get.cc:2360 +msgid "Failed to process build dependencies" +msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ " + +#: cmdline/apt-get.cc:2392 +msgid "Supported modules:" +msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:" + +#: cmdline/apt-get.cc:2433 +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 [पर्याय] संस्थापना pkg1 [pkg2 ...] काढून टाका\n" +" apt-get[पर्याय] pkg1 [pkg2 ...] उगम\n" +"\n" +"apt-get हा डाऊनलोड करण्यासाठी सोपी आदेश रेखित संवादमंच आहे आणि\n" +"पॅकेज संस्थापित करत आहे. नेहमी वापरले जाणारे आदेश म्हणजे पुढिल आवृत्ती\n" +"'आणि संस्थापित करा\n" +"\n" +"आदेश\n" +"पॅकेजच्या नव्या याद्यांच्या सुधारित आवृत्त्या-जमा करा\n" +" पुढिल आवृत्त्या-पुढिल आवृत्त्या तयार करा\n" +"संस्थापना - नवीन पॅकेजेस संस्थापित करा(pkg हे libc6 आहे आणि libc6.deb नव्हे)\n" +"कायमचे काढा -पॅकेजेस कायमची काढा\n" +"उगमस्थान -उगमस्थान अर्काईव्हज डाऊनलोड करा\n" +"बांधणी-डिप -उगमस्थान पॅकेजेससाठी बांधणी-डिपेंडन्सी संरचित करा।\n" +"डिस्ट-पुढिल आवृत्ती-वितरण पुढिल आवृत्ती,बघा apt-get(8)\n" +"न निवड -पुढिल आवृत्ती\n" +"स्वच्छ करा-डाऊनलोड केलेल्या अर्काईव्हज फाईल्स खोडून टाका\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=?- अनियंत्रित संरचना पर्याय निश्चित करा,eg -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 "%s (%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' ड्राईव्ह मध्ये व एंटर कळ दाबा\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 [पर्याय] फाईल१[फाईल २...]\n" +"\n" +" apt-sortpkgs हे पॅकेज फाईल्सचं वर्गीकरण करणारी एक साधी आज्ञावली आहे. -s पर्याय हा " +"फाईल\n" +"कुठल्या प्रकारची आहे हे दाखवण्यासाठी वापरतात.\n" +"\n" +"पर्याय\n" +" -h हा मदत मजकूर\n" +" -s उगमस्थान फाईल वापरा\n" +" -c=? ही संरचना फाईल वाचा\n" +" -o=?- अनियंत्रित संरचना पर्याय निश्चित करा,eg -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 "पुढे जाण्यासाठी एंटर दाबा." + +#: 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 "" +"ह्यावर संदेश खूप महत्त्वाचे आहेत.कृपया त्यांना नीट करा व संस्थापित करा पुन्हा चालवा/सुरू करा" + +#: 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:144 +msgid "Failed to exec gzip " +msgstr "exec gzip करण्यास असमर्थ" + +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +msgid "Corrupted archive" +msgstr "बिघडलेली अर्काईव्हज" + +#: apt-inst/contrib/extracttar.cc:196 +msgid "Tar checksum failed, archive corrupted" +msgstr "टार(टेपअर्काईव्ह) चेकसम चुकला, बिघडलेली अर्काईव्ह" + +#: apt-inst/contrib/extracttar.cc:299 +#, 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 +#, fuzzy +#| msgid "Failed to read the archive headers" +msgid "Failed to read the archive headers" +msgstr "अर्काईव्ह शीर्षक वाचण्यास असमर्थ आहे" + +#: apt-inst/filelist.cc:384 +msgid "DropNode called on still linked node" +msgstr "सुटा करण्यासाठी बोलावलेला/आणलेला सांधा(ड्रापनोड)अजुनही जुळलेलाच सांधा(लिंकनोड) आहे" + +#: 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 and %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 "File %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 "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 "पॅकेजचे नाव मिळवत असताना आंतरिक दोष/त्रुटी मिळाली" + +#: 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 "pkg अस्थाई स्मृतीकोष प्रथम इनिशिअलाईज्ड केला पाहिजे" + +#: apt-inst/deb/dpkgdb.cc:443 +#, c-format +msgid "Failed to find a Package: header, offset %lu" +msgstr "पॅकेज शोधण्यास असमर्थ: शिर्षक,आॅफसेट %lu" + +#: apt-inst/deb/dpkgdb.cc:465 +#, c-format +msgid "Bad ConfFile section in the status file. Offset %lu" +msgstr "आॅफसेट %lu, सद्यस्थिती फाईलमध्ये वाईट कॉन्फ फाईल भाग" + +#: apt-inst/deb/dpkgdb.cc:470 +#, c-format +msgid "Error parsing MD5. Offset %lu" +msgstr "ऑफसेट %lu, MD5. पार्सिंग मध्ये त्रुटी " + +#: 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:115 +#, c-format +msgid "Unable to read the cdrom database %s" +msgstr "%s सीडी-रॉम माहिती संच वाचण्यास असमर्थ" + +#: methods/cdrom.cc:124 +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 कडून ओळखण्यासाठी apt-cdrom चा वापर करा.apt-get update हे " +"नवीन सीडी राॅम अधिक मिळवण्यासाठी वापरता येणार नाही" + +#: methods/cdrom.cc:132 +msgid "Wrong CD-ROM" +msgstr "चूकीची सी-डी रॉम" + +#: methods/cdrom.cc:166 +#, fuzzy, c-format +#| msgid " Unable to unmount the CD-ROM in %s, it may still be in use." +msgid "Unable to unmount the CD-ROM in %s, it may still be in use." +msgstr "%s मध्ये सीडी-रॉम माऊंट करण्यास असमर्थ,अजूनही ते वापरता येऊ शकेल." + +#: methods/cdrom.cc:171 +msgid "Disk not found." +msgstr "डिस्क सापडत नाही" + +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 +msgid "File not found" +msgstr "फाईल सापडली नाही" + +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 +msgid "Failed to stat" +msgstr "स्टॅट करण्यास असमर्थ" + +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +msgid "Failed to set modification time" +msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ" + +#: methods/file.cc:44 +msgid "Invalid URI, local URIS must not start with //" +msgstr "अवैध यू आर एल, स्थानिक यू आर आय एस सुरू होऊ नये यापासून //" + +#. 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 "सर्व्हरने %s सांगितले,यूजर असमर्थ:" + +#: methods/ftp.cc:217 +#, c-format +msgid "PASS failed, server said: %s" +msgstr "सर्व्हरने %s सांगितले, पास असमर्थ:" + +#: methods/ftp.cc:237 +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "" +"प्रॉक्सी सर्व्हर निर्देशित केला पण लॉगीन स्क्रिप्ट नाही, प्राप्त केलेले ::ftp:: प्रॉक्सीलॉगीन " +"निरर्थक आहे." + +#: 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 "सर्व्हरने %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 "गेटअॅड्रेसइनफो लिसनिंग सॉकेट घेण्यास असमर्थ होते" + +#: 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 "पोर्ट आज्ञा पाठवता येत नाही/पोर्ट आज्ञा पाठविण्यास असमर्थ" + +#: 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 "ई.पी.आर.टी. चुकले,सर्व्हरने %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:959 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 "[आयपी:%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 "%s रिझॉल्व्ह होऊ शकत नाही " + +#: methods/connect.cc:173 +#, c-format +msgid "Temporary failure resolving '%s'" +msgstr "'%s' रिझॉल्व्ह करताना तात्पुरती त्रुटी" + +#: methods/connect.cc:176 +#, c-format +msgid "Something wicked happened resolving '%s:%s' (%i)" +msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना काहीतरी वाईट घडले" + +#: methods/connect.cc:223 +#, c-format +msgid "Unable to connect to %s %s:" +msgstr "%s %s ला जोडण्यास असमर्थ:" + +#: methods/gpgv.cc:65 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "'%s': कीरिंग पर्यंत पोहोचू शकत नाही" + +#: methods/gpgv.cc:100 +msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." +msgstr "" +"दोष: ::gpgv:: कडून प्राप्त झालेला ऑर्गुमेंट सूचीचा पर्याय खूप लांबीचा. बाहेर पडत आहे." + +#: methods/gpgv.cc:204 +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" +msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!" + +#: methods/gpgv.cc:209 +msgid "At least one invalid signature was encountered." +msgstr "किमान एक अवैध सही सापडली." + +#: methods/gpgv.cc:213 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr "" +"सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gnupg संस्थापित केले आहे का?)" + +#: methods/gpgv.cc:218 +msgid "Unknown error executing gpgv" +msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी" + +#: methods/gpgv.cc:249 +msgid "The following signatures were invalid:\n" +msgstr "खालील सह्या अवैध आहेत:\n" + +#: methods/gpgv.cc:256 +msgid "" +"The following signatures couldn't be verified because the public key is not " +"available:\n" +msgstr "खालील सह्यांची खात्री करता येत नाही कारण सार्वजनिक कीउपलब्ध नाही:\n" + +#: methods/gzip.cc:64 +#, c-format +msgid "Couldn't open pipe for %s" +msgstr "%s साठी पाईप उघडता येत नाही" + +#: methods/gzip.cc:109 +#, c-format +msgid "Read error from %s process" +msgstr "%s क्रियेपासून चूक वाचा" + +#: methods/http.cc:377 +msgid "Waiting for headers" +msgstr "शीर्षकासाठी थांबले आहे...." + +#: methods/http.cc:523 +#, c-format +msgid "Got a single header line over %u chars" +msgstr "%u अक्षरांवर एक शीर्षक ओळ मिळाली" + +#: methods/http.cc:531 +msgid "Bad header line" +msgstr "वाईट शीर्षक ओळ" + +#: methods/http.cc:550 methods/http.cc:557 +msgid "The HTTP server sent an invalid reply header" +msgstr "HTTP सर्व्हरने अवैध प्रत्त्युत्तर शीर्षक पाठविले" + +#: methods/http.cc:586 +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "HTTP सर्व्हरने अवैध मजकूर-लांबी शीर्षक पाठविले " + +#: methods/http.cc:601 +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "HTTP सर्व्हरने अवैध मजकूर-विस्तार शीर्षक पाठविले" + +#: methods/http.cc:603 +msgid "This HTTP server has broken range support" +msgstr "HTTP सर्व्हरने विस्तार तांत्रिक मदत जोडली" + +#: methods/http.cc:627 +msgid "Unknown date format" +msgstr "अपरिचित दिनांक प्रकार/स्वरूप " + +#: methods/http.cc:774 +msgid "Select failed" +msgstr "चुकले/असमर्थ निवड करा" + +#: methods/http.cc:779 +msgid "Connection timed out" +msgstr "जोडणी वेळेअभावी तुटली" + +#: methods/http.cc:802 +msgid "Error writing to output file" +msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक" + +#: methods/http.cc:833 +msgid "Error writing to file" +msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" + +#: methods/http.cc:861 +msgid "Error writing to the file" +msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" + +#: methods/http.cc:875 +msgid "Error reading from server. Remote end closed connection" +msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी" + +#: methods/http.cc:877 +msgid "Error reading from server" +msgstr "सर्व्हर मधून वाचण्यात चूक" + +#: methods/http.cc:1108 +msgid "Bad header data" +msgstr "चुकीचा शीर्षक डाटा" + +#: methods/http.cc:1125 +msgid "Connection failed" +msgstr "जोडणी अयशस्वी" + +#: methods/http.cc:1216 +msgid "Internal error" +msgstr "अंतर्गत त्रुटी" + +#: apt-pkg/contrib/mmap.cc:82 +msgid "Can't mmap an empty file" +msgstr "रिकामी फाईल mmap करता येणार नाही" + +#: apt-pkg/contrib/mmap.cc:87 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "mmap चे %lu बाईटस् करता येणार नाहीत" + +#: apt-pkg/contrib/strutl.cc:938 +#, c-format +msgid "Selection %s not found" +msgstr "%s निवडक भाग सापडत नाही" + +#: apt-pkg/contrib/configuration.cc:436 +#, fuzzy, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "संक्षिप्तरुपाचा माहित नसलेला प्रकार " + +#: 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: खूपच एकात एक इनक्लूडस्" + +#: 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: ह्या पासून समाविष्ट " + +#: 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:155 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... चूक/त्रुटी!" + +#: apt-pkg/contrib/progress.cc:157 +#, 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: संरचितेच्या यादीतील कलमांचा तपशीलाला असलेच पाहिजे ते =<मूल्य>." + +#: 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 संवेदना हे समजत नाही, चूक की बरोबर चा प्रयत्न करा." + +#: 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 "सीडी-रॉम स्टॅट करण्यास असमर्थ" + +#: 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 "%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 "संचिकेची syncing समस्या" + +#: 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 "'%s' आवृत्तीकरण प्रणालीला हे APT तांत्रिक मदत देऊ शकत नाही" + +#: 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:61 apt-pkg/depcache.cc:90 +msgid "Building dependency tree" +msgstr "अवलंबित रचना बांधणी करत आहे" + +#: apt-pkg/depcache.cc:62 +msgid "Candidate versions" +msgstr "कंॅडिडेट आवृत्त्या" + +#: apt-pkg/depcache.cc:91 +msgid "Dependency generation" +msgstr "अवलंबित/विसंबून असलेले उत्पादन " + +#: apt-pkg/tagfile.cc:106 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ" + +#: apt-pkg/tagfile.cc:193 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ" + +#: apt-pkg/sourcelist.cc:94 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s (URI)" +msgstr "%s स्त्रोत सुचीमध्ये(यूआरआय)%lu वाईट/व्यंग रेषा" + +#: apt-pkg/sourcelist.cc:96 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s (dist)" +msgstr "%s स्त्रोत सुचीमध्ये(डिआएसटी) %lu वाईट/व्यंग रेषा" + +#: apt-pkg/sourcelist.cc:99 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "%s स्त्रोत सुचीमध्ये(यूआरआय पार्स)%lu वाईट/व्यंग रेषा" + +#: apt-pkg/sourcelist.cc:105 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "%s स्त्रोत सुचीमध्ये(निरंकुश डिआएसटी) %lu वाईट/व्यंग रेषा" + +#: apt-pkg/sourcelist.cc:112 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "%s (डीआयएसटी पार्स)स्त्रोत सुचीमध्ये %lu वाईट/व्यंग रेषा" + +#: apt-pkg/sourcelist.cc:203 +#, c-format +msgid "Opening %s" +msgstr "%s उघडत आहे" + +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#, fuzzy, c-format +msgid "Line %u too long in source list %s." +msgstr "%s स्त्रोत सुचीमध्ये ओळ %u खूप लांब आहे." + +#: apt-pkg/sourcelist.cc:240 +#, fuzzy, c-format +msgid "Malformed line %u in source list %s (type)" +msgstr "%s (प्रकार)स्त्रोत सुचीमध्ये %u वाईट/व्यंग रेषा" + +#: 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 +#, fuzzy, c-format +msgid "Malformed line %u in source list %s (vendor id)" +msgstr "%s (विक्रेता आयडी)स्त्रोत सुचीमध्ये %u वाईट/व्यंग रेषा " + +#: 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 पॅकेज " +"गुंतागुंतीमुळे/Pre-Depends पूर्व अवलंबित आवर्तन.हे नेहमीच वाईट असते, पण जर तुम्हाला ते खरोखर " +"करावयाचे असेल तर,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:1066 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"दोष,पॅकेज समस्या निवारक::निवारण करतांना अडथळा निर्माण झाला, ह्याचे कारण स्थगित " +"पॅकेजेस असू शकते." + +#: apt-pkg/algorithms.cc:1068 +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 "संचयिका यादीत %s पार्शल हरवले आहे." + +#: apt-pkg/acquire.cc:66 +#, fuzzy, c-format +#| msgid "Archive directory %spartial is missing" +msgid "Archive directory %spartial is missing." +msgstr "ऑर्काइव्ह संचयिकेत %s पार्शल हरवले आहे." + +#. 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 "%li ची %li(%s राहिलेले) संचिका पुन:प्राप्त करीत आहे" + +#: apt-pkg/acquire.cc:825 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "%li ची %li संचिका पुन:प्राप्त करीत आहे" + +#: 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' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा." + +#: 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 घाला" + +#: 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 "पसंतीच्या संचिकेत अवैध माहितीसंच, पॅकेजला शीर्षक नाही " + +#: 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 (नविन पॅकेज) प्रक्रिया करीत असतांना दोष आढळून आला" + +#: apt-pkg/pkgcachegen.cc:129 +#, c-format +msgid "Error occurred while processing %s (UsePackage1)" +msgstr "%s (वापरातील पॅकेज१) प्रक्रिया करीत असतांना दोष आढळून आला" + +#: apt-pkg/pkgcachegen.cc:150 +#, c-format +msgid "Error occurred while processing %s (UsePackage2)" +msgstr "%s प्रक्रिया करीत असतांना दोष आढळून आला(वापरातील पॅकेज२)" + +#: apt-pkg/pkgcachegen.cc:154 +#, c-format +msgid "Error occurred while processing %s (NewFileVer1)" +msgstr "%s(नविन संचिका आवृती१) प्रक्रिया करीत असतांना दोष आढळून आला" + +#: apt-pkg/pkgcachegen.cc:184 +#, c-format +msgid "Error occurred while processing %s (NewVersion1)" +msgstr "%s (नविन आवृत्ती १) प्रक्रिया करीत असतांना दोष आढळून आला" + +#: apt-pkg/pkgcachegen.cc:188 +#, c-format +msgid "Error occurred while processing %s (UsePackage3)" +msgstr "%s(वापरातील पॅकेज३) प्रक्रिया करीत असतांना दोष आढळून आला" + +#: apt-pkg/pkgcachegen.cc:192 +#, c-format +msgid "Error occurred while processing %s (NewVersion2)" +msgstr "%s(नविन आवृती२) प्रक्रिया करीत असतांना दोष आढळून आला" + +#: apt-pkg/pkgcachegen.cc:207 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "" +"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही पॅकेज नांवांच्या संख्येची मर्यादा ओलांडली " +"आहे." + +#: apt-pkg/pkgcachegen.cc:210 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "" +"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही आवृत्त्या संख्येची मर्यादा ओलांडली आहे." + +#: apt-pkg/pkgcachegen.cc:213 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "" +"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही अवलंबित/विसंबून असलेल्या संख्येची मर्यादा " +"ओलांडली आहे." + +#: apt-pkg/pkgcachegen.cc:241 +#, c-format +msgid "Error occurred while processing %s (FindPkg)" +msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला" + +#: apt-pkg/pkgcachegen.cc:254 +#, c-format +msgid "Error occurred while processing %s (CollectFileProvides)" +msgstr "%s (तरतूद/पुरवलेल्या संचिका जमा) प्रक्रिया करीत असतांना दोष आढळून आला" + +#: 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 "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे" + +#: 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 "एमडी५ बेरीज/MD5Sum जुळत नाही" + +#: apt-pkg/acquire-item.cc:640 +#, fuzzy +#| msgid "There are no public key available for the following key IDs:\n" +msgid "There is 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 "" +"पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/" +"ठिकाण %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 "" +"सिडी-रॉमचे माउंट स्थान %s वापरुन\n" +"सिडी-रॉम माउंट होत आहे\n" + +#: apt-pkg/cdrom.cc:518 apt-pkg/cdrom.cc:600 +msgid "Identifying.. " +msgstr "ओळखत आहे.." + +#: apt-pkg/cdrom.cc:543 +#, c-format +msgid "Stored label: %s \n" +msgstr "ग्रहण केलेले नामदर्शक: %s \n" + +#: apt-pkg/cdrom.cc:563 +#, c-format +msgid "Using CD-ROM mount point %s\n" +msgstr "सिडी-रॉमचे माउंट स्थान %s वापरुन\n" + +#: apt-pkg/cdrom.cc:581 +msgid "Unmounting CD-ROM\n" +msgstr "सिडी-रॉम अनमाउंट करत आहे\n" + +#: apt-pkg/cdrom.cc:585 +msgid "Waiting for disc...\n" +msgstr "डिस्क/चकती करिता प्रतिक्षा करीत आहे...\n" + +#. Mount the new CDROM +#: apt-pkg/cdrom.cc:593 +msgid "Mounting CD-ROM...\n" +msgstr "सिडी-रॉम माउंट होत आहे...\n" + +#: apt-pkg/cdrom.cc:611 +msgid "Scanning disc for index files..\n" +msgstr "संचिकाच्या यादी/सूचीसाठी डिस्क/चकती बारकाईने तपासत आहे..\n" + +#: apt-pkg/cdrom.cc:649 +#, c-format +msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgstr "" +"%i पॅकेजेसची यादी/सूची , %i स्त्रोताची यादी/सूची आणि %i स्वाक्षऱ्या/सिगनेचर्स सापडल्या \n" + +#: apt-pkg/cdrom.cc:714 +msgid "That is not a valid name, try again.\n" +msgstr "ते स्विकारण्याजोगे/वैध नांव नाही, पुन्हा प्रयत्न करा.\n" + +#: apt-pkg/cdrom.cc:730 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"ह्या डिस्कला/चकतीला: म्हणतात\n" +"'%s'\n" + +#: apt-pkg/cdrom.cc:734 +msgid "Copying package lists..." +msgstr "पॅकेज सूचींच्या प्रती तयार करित आहे..." + +#: apt-pkg/cdrom.cc:758 +msgid "Writing new source list\n" +msgstr "नविन स्त्रोत सूची लिहित आहे\n" + +#: apt-pkg/cdrom.cc:767 +msgid "Source list entries for this disc are:\n" +msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत: \n" + +#: apt-pkg/cdrom.cc:810 +msgid "Unmounting CD-ROM..." +msgstr "सिडी-रॉम अनमाउंट होत आहे..." + +#: 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 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे" + +#: apt-pkg/deb/dpkgpm.cc:379 +#, c-format +msgid "Completely removed %s" +msgstr "%s संपूर्ण काढून टाकले" + +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "अकाली जोडणी बंद झाली" @@ -1,9 +1,5 @@ -# translation of apt.po to Norsk Bokml -# translation of apt.po to Norwegian -# translation of apt.po to Norwegian Bokml -# translation of apt.po to Norwegian bokml -# Norsk bokmlsoversettelse av meldinger i APT." -# Copyright 2002, 2003 Lars Bahner, Axel Bojer, Hans Fredrik Nordhaug +# Norsk bokmalsoversettelse av meldinger i APT." +# Copyright 2002, 2003 Lars Bahner, Axel Bojer, Hans Fredrik Nordhaug # Filen utgis under Gnu Public License version 2. # Lisensen er tilgjenglig fra http://www.gnu.org/licenses/gpl.txt # Lars Bahner <bahner@debian.org>, 2002-2003. @@ -13,16 +9,16 @@ # Klaus Ade Johnstad <klaus@skolelinux.no>, 2004. # Axel Bojer <axelb@skolelinux.no>, 2004. # Bjorn Steensrud <bjornst@powertech.no>, 2004. -# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2005. +# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2005-2006. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" -"PO-Revision-Date: 2005-02-09 10:45+0100\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"PO-Revision-Date: 2006-10-16 00:35+0100\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" -"Language-Team: Norwegian Bokml <i18n-nb@lister.ping.ui.no>\n" +"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" @@ -162,7 +158,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 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" @@ -244,19 +240,15 @@ msgstr "" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" +msgstr "Oppgi et navn for disken, eksempelvis Debian 2.1r1 disk 1" #: 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" +msgstr "Sett inn en disk i lagringsenheten og trykk Enter" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "" +msgstr "Gjenta denne prosessen for resten av CD-ene i ditt sett." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" @@ -354,7 +346,6 @@ msgid "Error processing contents %s" msgstr "Det oppsto en feil ved lesing av %s" #: ftparchive/apt-ftparchive.cc:556 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -445,115 +436,128 @@ msgstr "Ingen utvalg passet" msgid "Some files are missing in the package file group `%s'" msgstr "Enkelte filer mangler i pakkegruppa %s" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Databasen er delagt. Filnavnet er endret til %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Databasen er gammel, forsker oppgradere %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"DB-formatet er ugyldig. Hvis du oppgraderte fra en eldre versjon av apt, " +"fjern og s gjenopprett databasen." + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Klarte ikke pne Databasefila %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Fildatoen er endret %s" +msgid "Failed to stat %s" +msgstr "Klarte ikke f statusen p %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrollpost" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Klarte ikke finne en peker" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Klarte ikke lese katalogen %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Klarte ikke f statusen p %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "F:" -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "A:" -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "F: Det er feil ved fila" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Klarte ikke sl opp %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Klarte ikke finne fram i treet" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Klarte ikke pne %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Klarte ikke lese lenken %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Klarte ikke oppheve lenken %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Klarte ikke lenke %s til %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa p %s B er ndd.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Klarte ikke f statusen p %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Arkivet har ikke noe pakkefelt" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen overstyringsoppfring\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikeholderen er %s, ikke %s\n" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s har ingen kildeoverstyringsoppfring\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s har ingen binroverstyringsoppfring heller\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -722,12 +726,11 @@ msgid "%s (due to %s) " msgstr "%s (pga. %s) " #: cmdline/apt-get.cc:546 -#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"ADVARSEL: Flgende kjernepakker vil bli fjernet\n" +"ADVARSEL: Flgende essensielle pakker vil bli fjernet.\n" "Dette br IKKE gjres, med mindre du vet nyaktig hva du gjr!" #: cmdline/apt-get.cc:577 @@ -789,7 +792,7 @@ msgstr "ADVARSEL: Flgende pakker ble ikke autentisert!" #: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Autentiseringsadvarsel overstyrt.\n" #: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " @@ -805,22 +808,21 @@ msgstr "Det oppsto problemer og -y ble brukt uten --force-yes" #: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "Intern feil, InstallPackages ble kalt med delagte pakker!" #: 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:775 -#, fuzzy msgid "Internal error, Ordering didn't finish" -msgstr "Det oppsto en intern feil nr avledningen ble lagt til" +msgstr "Intern feil, sortering fullfrte ikke" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Klarer ikke lse nedlastingsmappa" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Kan ikke lese kildlista." @@ -828,6 +830,8 @@ msgstr "Kan ikke lese kildlista." #: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" +"S rart ... Strrelsene stemmer ikke overens, send en e-post til " +"apt@packages.debian.org" #: cmdline/apt-get.cc:821 #, c-format @@ -849,10 +853,10 @@ msgstr "Etter utpakking vil %sB ekstra diskplass bli brukt.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB diskplass bli ledig.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 -#, fuzzy, c-format +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#, c-format msgid "Couldn't determine free space in %s" -msgstr "Du har ikke nok ledig plass i %s" +msgstr "Klarte ikke bestemme ledig plass i %s" #: cmdline/apt-get.cc:849 #, c-format @@ -869,14 +873,14 @@ msgid "Yes, do as I say!" msgstr "Ja, gjr som jeg sier!" #: cmdline/apt-get.cc:868 -#, fuzzy, c-format +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" "Du er iferd med utfre en mulig skadelig handling.\n" -"For fortsette, skriv: %s\n" +"For fortsette skriv inn teksten %s\n" " ?] " #: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 @@ -887,7 +891,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke skaffe %s %s\n" @@ -896,7 +900,7 @@ msgstr "Klarte ikke skaffe %s %s\n" msgid "Some files failed to download" msgstr "Noen av filene kunne ikke lastes ned" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Nedlasting fullfrt med innstillinga bare nedlasting" @@ -1070,115 +1074,114 @@ msgstr "delagte pakker" msgid "The following extra packages will be installed:" msgstr "Flgende ekstra pakker vil bli installert." -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Foresltte pakker:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Anbefalte pakker" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislyktes" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Utfrt" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 -#, fuzzy +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" -msgstr "Intern feil - AllUpgrade dela noe" +msgstr "Intern feil, problemlser dela noe" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "Du m angi minst en pakke du vil ha kildekoden til" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke finne en kildekodepakke for %s" -#: cmdline/apt-get.cc:1950 -#, fuzzy, c-format +#: cmdline/apt-get.cc:1968 +#, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Omgr utpakking av allerede utpakket kilde i %s\n" +msgstr "Hopper over allerede nedlastet fil %s\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Trenger skaffe %sB av %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Klarte ikke skaffe alle arkivene." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgr utpakking av allerede utpakket kilde i %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Sjekk om pakken dpkg-dev er installert.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "Du m angi minst en pakke du vil sjekke builddeps for" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarer ikke skaffe informasjon om bygge-avhengighetene for %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1187,32 +1190,32 @@ msgstr "" "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige " "versjoner av pakken %s som oppfyller versjonskravene" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikke tilfredsstille %s avhengighet for %s: den installerte pakken %" "s er for ny" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Klarte ikke behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Stttede moduler:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1394,19 +1397,19 @@ msgstr "Fletter tilgjengelig informasjon" msgid "Failed to create pipes" msgstr "Klarte ikke opprette rr" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Klarte ikke kjre gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "delagt arkiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-sjekksummen mislykkes, arkivet er delagt" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukjent TAR-hode: type %u, medlem %s" @@ -1463,7 +1466,7 @@ msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" msgstr "Klarte ikke skrive fila %s" @@ -1675,28 +1678,27 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Feil CD-plate" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Klarer ikke avmontere CD-plata i %s. Det kan hende plata fremdeles er i " "bruk." -#: methods/cdrom.cc:169 -#, fuzzy +#: methods/cdrom.cc:171 msgid "Disk not found." -msgstr "Fant ikke fila" +msgstr "Disk ikke funnet." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fant ikke fila" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Klarte ikke f status" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Klarte ikke sette endringstidspunkt" @@ -1824,7 +1826,7 @@ msgstr "Tidsavbrudd p tilkoblingen til datasokkelen" msgid "Unable to accept connection" msgstr "Klarte ikke godta tilkoblingen" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1908,124 +1910,126 @@ msgstr "Noe galt skjedde ved oppslag av %s:%s (%i)" msgid "Unable to connect to %s %s:" msgstr "Klarte ikke koble til %s %s:" -#: methods/gpgv.cc:64 -#, fuzzy, c-format +#: methods/gpgv.cc:65 +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Klarte ikke sl opp %s" +msgstr "Klarte ikke sl opp i nkkelring; %s" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" +msgstr "E: Argumentliste fra Acquire::gpgv::Options for lang. Avbryter." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "" +msgstr "Intern feil: God signatur, men kunne bestemme nkkelfingeravtrykk?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "Minst en ugyldig signatur ble funnet." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" +"Klarte ikke kjre %s for verifisere signaturen (er gnupg installert?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Ukjent feil ved kjring av gpgv" -#: methods/gpgv.cc:243 -#, fuzzy +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" -msgstr "Flgende ekstra pakker vil bli installert." +msgstr "De flgende signaturene var ugyldige:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"De flgende signaturene kunne ikke verifiseres fordi den offentlige nkkelen " +"ikke er tilgjengelig:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Klarte ikke pne rr for %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Lesefeil fra %s-prosessen" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Venter p hoder" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Fikk en enkel hodelinje over %u tegn" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "delagt hodelinje" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-tjeneren sendte et ugyldig svarhode" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-tjeneren sendte et ugyldig Content-Length-hode" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-tjeneren sendte et ugyldig Content-Range-hode" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Denne HTTP-tjeneren har delagt sttte for omrde" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Tidsavbrudd p forbindelsen" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "delagte hodedata" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Intern feil" @@ -2098,12 +2102,12 @@ msgstr "Syntaksfeil %s:%u: Direktivet %s er ikke stttet" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfeil %s:%u: Ugyldige angivelser p slutten av fila" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s ... Feil" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s ... Ferdig" @@ -2316,12 +2320,12 @@ msgstr "Versjons-kandidater" msgid "Dependency generation" msgstr "Oppretter avhengighetsforhold" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Klarer ikke fortolke pakkefila %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Klarer ikke fortolke pakkefila %s (2)" @@ -2367,7 +2371,7 @@ msgid "Malformed line %u in source list %s (type)" msgstr "Feil p %u i kildelista %s (type)" #: apt-pkg/sourcelist.cc:244 -#, fuzzy, c-format +#, 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" @@ -2399,7 +2403,7 @@ msgid "" msgstr "" "Pakka %s trenger installeres p nytt, men jeg finner ikke lageret for den." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2407,7 +2411,7 @@ msgstr "" "Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker " "som holdes tilbake." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "Klarer ikke rette problemene, noen delagte pakker er holdt tilbake." @@ -2423,15 +2427,15 @@ msgstr "Arkivmappa %spartial mangler." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "" +msgstr "Henter fil %li av %li (%s gjenvrende)" -#: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:832 +#, c-format msgid "Retrieving file %li of %li" -msgstr "Les filliste" +msgstr "Henter fil %li av %li" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2444,12 +2448,9 @@ msgid "Method %s did not start correctly" msgstr "Metoden %s startet 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 "" -"Bytte av media: sett inn CD-en som er merket\n" -" %s\n" -"i %s og trykk Enter\n" +msgstr "Sett inn disken merket %s i lagringsenheten %s og trykk Enter." #: apt-pkg/init.cc:120 #, c-format @@ -2479,16 +2480,16 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Det kan hende du vil kjre apt-get update for rette p disse problemene" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Ugyldig oppslag i foretrekksfila, manglende pakkehode" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Forsto ikke spikring av typen %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller null) spesifisert for pin" @@ -2576,15 +2577,16 @@ 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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "Feil MD5sum" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "" +"Det er ingen offentlig nkkel tilgjengelig for de flgende nkkel-ID-ene:\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2593,7 +2595,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:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2602,13 +2604,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:848 +#: apt-pkg/acquire-item.cc:855 #, 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:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Feil strrelse" @@ -2662,11 +2664,16 @@ msgstr "Leter gjennom CD for indeksfiler..\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Fant %i pakkeindekser, %i kildeindekser og %i signaturer\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Lagret merkelapp: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Det er ikke et gyldig navn, prv igjen.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2675,20 +2682,21 @@ msgstr "" "CD-en er kalt: \n" "%s\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Kopierer pakkelister..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Skriver ny kildeliste\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Kildelisteoppfringer for denne CD-en er:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "Avmonterer CD-ROM..." #: apt-pkg/indexcopy.cc:261 @@ -2712,84 +2720,68 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "pner %s" +msgstr "Forbereder %s" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "pner %s" +msgstr "Pakker ut %s" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "pner oppsettsfila %s" +msgstr "Forbereder konfigurering %s" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "Kobler til %s" +msgstr "Konfigurer %s" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Installert: " +msgstr "Installerte %s" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "Forbereder fjerning av %s" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "pner %s" +msgstr "Fjerner %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Anbefaler" +msgstr "Fjernet %s" #: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#, c-format msgid "Preparing to completely remove %s" -msgstr "pner oppsettsfila %s" +msgstr "Forbereder fullstendig slette %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#, c-format msgid "Completely removed %s" -msgstr "Klarte ikke fjerne %s" +msgstr "Fjernet %s fullstendig" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Forbindelsen ble uventet stengt" -#: 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 "" +#~ msgid "File date has changed %s" +#~ msgstr "Fildatoen er endret %s" -#: ftparchive/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s har ingen overstyringsoppfring\n" - -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s har ingen overstyringsoppfring\n" - -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Kunne ikke pne fila %s" +#~ msgid "Could not patch file" +#~ msgstr "Kunne ikke pne fila %s" #~ msgid "Reading file list" #~ msgstr "Leser filliste" -#, fuzzy #~ msgid "Could not execute " #~ msgstr "Fr ikke lst %s" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2006-10-11 20:34+0200\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n" "Language-Team: Nepali <info@mpp.org.np>\n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 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" @@ -427,115 +427,126 @@ msgstr "कुनै चयनहरू मेल खाएन" msgid "Some files are missing in the package file group `%s'" msgstr "केही फाइलहरू प्याकेज फाइल समूह `%s' मा हराइरहेको छ" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB दूषित थियो, फाइल %s.पुरानो मा पुन:नामकरण गर्नुहोस्" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB पुरानो छ, %s स्तरवृद्धि गर्न प्रयास गरिदैछ" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "DB फाइल %s असक्षम भयो: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "फाइल डेटाले %s परिवर्तन गर्यो" +msgid "Failed to stat %s" +msgstr " %s स्थिर गर्न असफल" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "संग्रह संग नियन्त्रण रेकर्ड छैन" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "कर्सर प्राप्त गर्न असक्षम भयो" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: डाइरेक्ट्री %s पढ्न असक्षम\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: %s स्थिर गर्न असक्षम\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: फाइलमा त्रुटिहरू लागू गर्नुहोस्" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "%s हल गर्न असफल भयो" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "ट्री हिडाईँ असफल भयो" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "%s खोल्न असफल" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "लिङ्क पढ्न असफल %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "अनलिङ्क गर्न असफल %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s मा %s लिङ्क असफल भयो" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "यस %sB हिटको डि लिङ्क सिमा।\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr " %s स्थिर गर्न असफल" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "संग्रह संग कुनै प्याकेज फाँट छैन" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s संभारकर्ता %s हो %s होइन\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -796,11 +807,11 @@ msgstr "प्याकेजहरू हट्न चाहदैछन् त msgid "Internal error, Ordering didn't finish" msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।" @@ -829,7 +840,7 @@ msgstr "अनप्याक गरिसके पछि थप डिस् msgid "After unpacking %sB disk space will be freed.\n" msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन" @@ -866,7 +877,7 @@ msgstr "परित्याग गर्नुहोस् ।" msgid "Do you want to continue [Y/n]? " msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s तान्न असफल भयो\n" @@ -875,7 +886,7 @@ msgstr "%s %s तान्न असफल भयो\n" msgid "Some files failed to download" msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ" @@ -1049,114 +1060,114 @@ msgstr "भाँचिएका प्याकेजहरू" msgid "The following extra packages will be installed:" msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "सुझाव दिएका प्याकेजहरू:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "सिफारिस गरिएका प्याकेजहरू:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "स्तर वृद्धि गणना गरिदैछ..." -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "असफल भयो" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "काम भयो" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो " -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "स्रोत फड्काउनुहोस् %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "केही संग्रह फड्काउन असफल भयो ।" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "अनप्याक आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "निर्माण आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "शाखा प्रक्रिया असफल भयो" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, 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 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1165,30 +1176,30 @@ msgstr "" "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण " "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन " -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । " -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "समर्थित मोड्युलहरू:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1369,19 +1380,19 @@ msgstr "उपलब्ध सूचना गाँभिदैछ" msgid "Failed to create pipes" msgstr "पाइपहरू सिर्जना गर्न असफल" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "gzip कार्यन्वयन गर्न असफल" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "संग्रह दूषित भयो" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "टार चेकसम असफल भयो, संग्रह दूषित भयो" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "अज्ञात टार हेडर प्रकार %u, सदस्य %s" @@ -1660,12 +1671,12 @@ msgstr "डिस्क फेला परेन ।" msgid "File not found" msgstr "फाइल फेला परेन " -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "स्थिर गर्न असफल भयो" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "परिमार्जन समय सेट असफल भयो" @@ -1877,49 +1888,49 @@ msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट msgid "Unable to connect to %s %s:" msgstr "%s %s मा जडान गर्न असफल भयो:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "कुञ्जी घण्टी पहुँच गर्न सकिएन: '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: प्राप्त गर्नेबाट तर्क सूचि::gpgv::अति लामो विकल्पहरू अवस्थित छ ।" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।" -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gnupg स्थापना भयो?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "निम्न हस्ताक्षरहरू रूजू हुन सक्दैन किन भने सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "%s को लागि पाइप खोल्न सकिएन" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "%s प्रक्रियाबाट त्रुटि पढ्नुहोस् " @@ -2284,12 +2295,12 @@ msgstr "उमेद्वार संस्करणहरू" msgid "Dependency generation" msgstr "निर्भरता सिर्जना" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)" @@ -2543,7 +2554,7 @@ msgid "MD5Sum mismatch" msgstr "MD5Sum मेल भएन" #: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +msgid "There is no public key available for the following key IDs:\n" msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n" #: apt-pkg/acquire-item.cc:753 @@ -2726,3 +2737,6 @@ msgstr " %s पूर्ण रुपले हट्यो" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "जडान असमायिक बन्द भयो" + +#~ msgid "File date has changed %s" +#~ msgstr "फाइल डेटाले %s परिवर्तन गर्यो" @@ -1,14 +1,14 @@ -# Advanced Package Transfer - APT message translation catalog -# Guus Sliepen <guus@sliepen.warande.net>, 2002. -# Jochem Berends <j@jochem.net>, 2002. -# Wannes Soenen <wannes@wannes.cjb.net>, 2002. +# advanced package transfer - apt message translation catalog +# guus sliepen <guus@sliepen.warande.net>, 2002. +# jochem berends <j@jochem.net>, 2002. +# wannes soenen <wannes@wannes.cjb.net>, 2002. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" -"PO-Revision-Date: 2005-02-10 17:35+0100\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"PO-Revision-Date: 2006-10-17 22:35+0100\n" "Last-Translator: Bart Cornelis <cobaco@linux.be>\n" "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -37,7 +37,7 @@ msgstr " Normale pakketten: " #: cmdline/apt-cache.cc:273 msgid " Pure virtual packages: " -msgstr " Puur virtuele pakketten: " +msgstr " Zuiver virtuele pakketten: " #: cmdline/apt-cache.cc:274 msgid " Single virtual packages: " @@ -49,7 +49,7 @@ msgstr " Gemengde virtuele pakketten: " #: cmdline/apt-cache.cc:276 msgid " Missing: " -msgstr " Missend: " +msgstr " Ontbrekend: " #: cmdline/apt-cache.cc:278 msgid "Total distinct versions: " @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 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" @@ -207,7 +207,7 @@ msgstr "" " stats - Toon enkele basisstatistieken\n" " dump - Toon het gehele bestand in een compacte vorm\n" " dumpavail - Print een beschikbaarheidsbestand op stdout\n" -" unmet - Toon vereisten die niet voldaan zijn\n" +" unmet - Toon niet voldane vereisten\n" " search - Toon lijst met pakketten die met regexpatroon overeenkomen\n" " show - Toon een leesbaar dossier voor het pakket\n" " depends - Toon de vereisten voor een pakket\n" @@ -218,11 +218,11 @@ msgstr "" " policy - Toon beleidsinstellingen\n" "\n" "Opties:\n" -" -h Deze hulptekst.\n" +" -h Deze hulptekst.\n" " -p=? De pakketcache.\n" " -s=? De broncache.\n" -" -q Voortgangsindicator uitschakelen.\n" -" -i Toon alleen belangrijke vereisten voor unmet opdracht.\n" +" -q Voortgangsindicator uitschakelen.\n" +" -i Toon alleen belangrijke vereisten voor unmet opdracht.\n" " -c=? Lees dit configuratiebestand.\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" "\n" @@ -231,18 +231,15 @@ msgstr "" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" msgstr "" +"Gelieve een naam voor deze schijf op te geven, zoals 'Debian 2.1r1 Schijf 1'" #: 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" +msgstr "Gelieve een schijf in het station te plaatsen en op 'enter' te drukken" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "" +msgstr "Dit proces dient herhaald te worden voor alle CD's in uw set." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" @@ -265,14 +262,15 @@ msgid "" msgstr "" "Gebruik: apt-config [opties] opdracht\n" "\n" -"apt-config is een simpel programma om het APT-configuratiebestand te lezen\n" +"apt-config is een eenvoudig programma om het APT-configuratiebestand te " +"lezen\n" "\n" "Opdrachten:\n" -" shell - Shell modus\n" -" dump - Toon de configuratie\n" +" shell - Shell modus\n" +" dump - Toon de configuratie\n" "\n" "Opties:\n" -" -h Deze hulptekst.\n" +" -h Deze hulptekst.\n" " -c=? Lees dit configuratiebestand.\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" @@ -340,7 +338,6 @@ msgid "Error processing contents %s" msgstr "Fout bij het verwerken van de inhoud van %s" #: ftparchive/apt-ftparchive.cc:556 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -381,173 +378,185 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" msgstr "" -"Gebruik: apt-ftparchive [opties] opdracht\n" +"Gebruik: apt-ftparchive [opties] commando\n" "\n" -"Opdrachten: packages binariespad [voorrangsbestand [padprefix]]\n" -" sources bronpad [voorrangsbestand [padprefix]]\n" -" contents pad\n" -" release pad\n" +"Commandos': packages <pad naar .deb's> [voorrangsbestand [padprefix]]\n" +" sources <pad naar .dsc's> [voorrangsbestand [padprefix]]\n" +" contents <pad>\n" +" release <pad>\n" " generate config [groepen]\n" " clean config\n" "\n" "Met apt-ftparchive genereert u index bestanden voor Debian archieven.\n" -"Het ondersteunt verschillende aanmaakstijlen gaande van volledig " -"automatisch\n" -"tot een functionele vervangingen van dpkg-scanpackages en dpkg-scansources\n" +"Het ondersteunt verschillende generatiestijlen varirend van volledig \n" +"automatisch tot een functionele vervanging van dpkg-scanpackages en \n" +"dpkg-scansources\n" "\n" "apt-ftparchive genereert pakketbestanden van een boom met .debs.\n" -"Het pakketbestand bevat de inhoud van alle beheervelden van elk pakket\n" -"alsook de MD5 hash en de bestandsgrootte. Via een voorrangsbestand\n" +"Het 'Packages'-bestand bevat de inhoud van alle 'control'-velden van elk\n" +"pakket alsook de MD5 hash en de bestandsgrootte. Via een voorrangsbestand\n" "kunnen de waardes van de 'Priority'- en 'Section'-velden afgedwongen\n" "worden.\n" "\n" -"Op gelijkaardige wijze genereert apt-ftparchive de bronbestanden van\n" -"een boom met .dscs. De '--source-override'-optie kan gebruikt worden om\n" -"een bronvoorrangsbestand te specificeren.\n" +"Op overeenkomstige wijze genereert apt-ftparchive de 'Sources'-bestanden\n" +"van een boom met .dscs. De '--source-override'-optie kan gebruikt worden\n" +"om een voorrangsbestand voor bronpakketten te specificeren.\n" "\n" "De 'packages' en 'sources' opdrachten dienen uitgevoerd te worden \n" -"in de basismap van de boom. Binariespad dient te verwijzen naar het " -"startpunt\n" -"van de recursieve zoekopdracht en een voorrangsbestand dient de \n" -"voorrangsvlaggen te bevatten. Padprefix wordt toegevoegd aan het " -"'filename'-\n" -"veld indien dit aanwezig is. Enkele voorbeelden uit het debian archief:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" +"in de basismap van de boom. Het pad naar de .deb's dient te verwijzen naar\n" +"het startpunt van de recursieve zoekopdracht en een voorrangsbestand dient\n" +"de voorrangsvlaggen te bevatten. Padprefix wordt toegevoegd aan het\n" +"'filename'-veld indien dit aanwezig is. Enkele voorbeelden uit het debian\n" +"archief:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" "\n" "Opties:\n" -" -h Deze hulptekst\n" -" --md5 Beheer de MD5 generatie\n" -" -s=? Bronvoorrangsbestand\n" -" -q Stille uitvoer\n" -" -d=? Selecteerd de optionele caching database\n" +" -h Deze hulptekst\n" +" --md5 Beheer de MD5 generatie\n" +" -s=? Bronvoorrangsbestand\n" +" -q Stille uitvoer\n" +" -d=? Selecteert de optionele caching database\n" " --no-delink Schakelt de ontlinking debug modus in\n" " --contents Beheer de generatie van het inhoudsbestand\n" -" -c=? Lees dit configuratiebestand in\n" -" -o=? Stel een willekeurige configuratie optie in" +" -c=? Lees dit configuratiebestand in\n" +" -o=? Stel een willekeurige configuratie optie in" #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" -msgstr "Er waren geen passende selecties" +msgstr "Geen van de selecties kwam overeen" #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB is beschadigd, bestand hernoemd naar %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "DB is verouderd, opwaardering %s wordt geprobeerd" +msgstr "DB is verouderd, opwaardering van %s wordt geprobeerd" + +#: 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 "" +"DB-formaat is ongeldig. Als u opgewaardeerd heeft van een oudere versie, van " +"apt, dient u de database te verwijderen en opnieuw aan te maken." -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kan het DB-bestand %s niet openen: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Bestandsdatum is veranderd %s" +msgid "Failed to stat %s" +msgstr "Status opvragen van %s is mislukt" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archief heeft geen 'control'-record" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Kan geen cursor verkrijgen" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Kon map %s niet lezen\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Kon de status van %s niet opvragen\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "F: Er zijn fouten van toepassing op het bestand " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Oplossen van %s is mislukt" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Doorlopen boomstructuur is mislukt" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Openen van %s is mislukt" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " OntlLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" -msgstr "Waarde van link %s weergeven is mislukt" +msgstr "Uitvoeren van readlink op %s is mislukt" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Ontlinken van %s is mislukt" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Linken van %s aan %s is mislukt" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Ontlinklimiet van %sB is bereikt.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Status opvragen van %s is mislukt" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Archief heeft geen 'package'-veld" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s heeft geen voorrangsingang\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s beheerder is %s, niet %s\n" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s heeft geen voorrangsingang voor bronpakketten\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" -msgstr "Interne fout, kon lokaal onderdeel %s niet vinden" +msgstr "Interne fout, kon onderdeel %s niet vinden" #: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" @@ -571,7 +580,7 @@ msgstr "Misvormde voorrangsingang %s op regel %lu #2" #: ftparchive/override.cc:92 ftparchive/override.cc:195 #, c-format msgid "Malformed override %s line %lu #3" -msgstr "Misvormde voorrangingang %s op regel %lu #3" +msgstr "Misvormde voorrangsingang %s op regel %lu #3" #: ftparchive/override.cc:131 ftparchive/override.cc:205 #, c-format @@ -623,7 +632,7 @@ msgstr "decompressor" #: ftparchive/multicompress.cc:406 msgid "IO to subprocess/file failed" -msgstr "IO naar subproces is mislukt" +msgstr "IO naar subproces/bestand is mislukt" #: ftparchive/multicompress.cc:458 msgid "Failed to read while computing MD5" @@ -709,21 +718,20 @@ msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:" #: cmdline/apt-get.cc:538 #, c-format msgid "%s (due to %s) " -msgstr "%s (wegens %s) " +msgstr "%s (vanwege %s) " #: cmdline/apt-get.cc:546 -#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"WAARSCHUWING: De volgende essentile pakketten zullen verwijderd worden\n" -"Dit dient NIET gedaan te worden tenzij u echt weet wat u doet!" +"WAARSCHUWING: De volgende essentile pakketten zullen verwijderd worden.\n" +"Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!" #: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu pakketten opgewaardeerd, %lu nieuwe pakketten genstalleerd, " +msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw genstalleerd, " #: cmdline/apt-get.cc:581 #, c-format @@ -738,7 +746,7 @@ msgstr "%lu gedegradeerd, " #: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu verwijderen en %lu niet opgewaardeerd.\n" +msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n" #: cmdline/apt-get.cc:589 #, c-format @@ -747,7 +755,7 @@ msgstr "%lu pakketten niet volledig genstalleerd of verwijderd.\n" #: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." -msgstr "Vereisten worden verbeterd..." +msgstr "Vereisten worden gecorrigeerd..." #: cmdline/apt-get.cc:652 msgid " failed." @@ -755,11 +763,11 @@ msgstr " mislukt." #: cmdline/apt-get.cc:655 msgid "Unable to correct dependencies" -msgstr "Kan vereisten niet verbeteren" +msgstr "Kan vereisten niet corrigeren" #: cmdline/apt-get.cc:658 msgid "Unable to minimize the upgrade set" -msgstr "Kon de verzameling van op te waarderen pakketten niet minimaliseren" +msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren" #: cmdline/apt-get.cc:660 msgid " Done" @@ -780,7 +788,7 @@ msgstr "" #: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Authenticatiewaarschuwing is genegeerd.\n" #: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " @@ -796,22 +804,21 @@ msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes" #: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "Interne fout, InstallPackages is aangeroepen met defecte pakketten!" #: 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:775 -#, fuzzy msgid "Internal error, Ordering didn't finish" -msgstr "Interne fout bij het toevoegen van een omleiding" +msgstr "Interne fout, rangschikken is niet voltooid" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "De lijst van bronnen kon niet gelezen worden." @@ -819,6 +826,8 @@ msgstr "De lijst van bronnen kon niet gelezen worden." #: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" +"Merkwaardig... De groottes kwamen niet overeen, gelieve apt@packages.debian." +"org te mailen" #: cmdline/apt-get.cc:821 #, c-format @@ -840,15 +849,15 @@ msgstr "Na het uitpakken zal er %sB extra schijfruimte gebruikt worden.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Na het uitpakken zal er %sB schijfruimte vrijkomen.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 -#, fuzzy, c-format +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#, c-format msgid "Couldn't determine free space in %s" -msgstr "U heeft niet voldoende vrije schijfruimte op %s" +msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen" #: 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." +msgstr "U heeft onvoldoende vrije schijfruimte op %s." #: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." @@ -859,14 +868,14 @@ msgid "Yes, do as I say!" msgstr "Ja, doe wat ik zeg!" #: cmdline/apt-get.cc:868 -#, fuzzy, c-format +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" "U staat op het punt om iets te doen wat mogelijk schadelijk is.\n" -"Als u wilt doorgaan dient u de zin '%s' in (helemaal) in te tikken.\n" +"Als u wilt doorgaan, dient u de zin '%s' in te typen.\n" " ?] " #: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 @@ -877,7 +886,7 @@ msgstr "Afbreken." msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s %s is mislukt\n" @@ -886,7 +895,7 @@ msgstr "Ophalen van %s %s is mislukt\n" msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" @@ -1063,112 +1072,111 @@ msgstr "Niet-werkende pakketten:" msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen genstalleerd worden:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislukt" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Klaar" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 -#, fuzzy +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" -msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" +msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 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" +"U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet " +"worden" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:1950 -#, fuzzy, c-format +#: cmdline/apt-get.cc:1968 +#, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n" +msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket genstalleerd is.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" "U dient tenminste n pakket op te geven om de bouwvereisten van te " "controleren" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1177,7 +1185,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1186,32 +1194,32 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen " "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Voldoen van Vereiste %s van pakket %s is mislukt: genstalleerde versie %s " "is te nieuw" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1402,19 +1410,19 @@ msgstr "De beschikbare informatie wordt samengevoegd" msgid "Failed to create pipes" msgstr "Aanmaken pijp is mislukt" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Uitvoeren van gzip is mislukt " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Beschadigd archief" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar controlesom klopt niet, het pakket is beschadigd" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Onbekende TAR-kopteksttype %u, onderdeel %s" @@ -1471,7 +1479,7 @@ msgid "Duplicate conf file %s/%s" msgstr "Dubbel configuratiebestand %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" msgstr "Wegschrijven van bestand %s is mislukt" @@ -1684,27 +1692,26 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Verkeerde CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Kan de CD-ROM in %s niet loskoppelen, mogelijk wordt die nog steeds gebruikt." -#: methods/cdrom.cc:169 -#, fuzzy +#: methods/cdrom.cc:171 msgid "Disk not found." -msgstr "Bestand niet gevonden" +msgstr "Schijf niet gevonden" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Bestand niet gevonden" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Status opvragen is mislukt" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Instellen van de aanpassingstijd is mislukt" @@ -1832,7 +1839,7 @@ msgstr "Datasocket verbinding is verlopen" msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" @@ -1916,127 +1923,134 @@ msgstr "Er gebeurde iets raars bij het zoeken naar '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "Kan niet verbinden met %s %s:" -#: methods/gpgv.cc:64 -#, fuzzy, c-format +#: methods/gpgv.cc:65 +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Kon '%s' niet vinden" +msgstr "Kon de sleutelring niet benaderen: '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" +"F: argumentenlijst van Acquire::gpv::Options was te lang. Er wordt " +"afgesloten." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" +"Interne fout: ondertekening is goed maar kon de vingerafdruk van de sleutel\n" +"niet bepalen?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "Er is tenminste n ongeldige ondertekening gevonden." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" +"Kon '%s' niet uitvoeren om ondertekening te verifiren (is gnupg " +"genstalleerd?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Onbekende fout bij het uitvoeren van gpgv" -#: methods/gpgv.cc:243 -#, fuzzy +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" -msgstr "De volgende extra pakketten zullen genstalleerd worden:" +msgstr "De volgende ondertekeningen waren ongeldig:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"De volgende ondertekeningen konden niet geverifierd worden omdat de " +"publieke sleutel niet beschikbaar is:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Kon geen pijp openen voor %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Leesfout door proces %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Wachtend op de kopteksten" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Foute koptekstregel" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd" -#: methods/http.cc:585 +#: methods/http.cc:586 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:600 +#: methods/http.cc:601 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:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:874 +#: methods/http.cc:875 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:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Interne fout" @@ -2111,12 +2125,12 @@ msgstr "Syntaxfout %s:%u: Niet-ondersteunde richtlijn '%s'" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfout %s:%u: Extra rommel aan het einde van het bestand" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Fout!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Klaar" @@ -2334,12 +2348,12 @@ msgstr "Kandidaat-versies" msgid "Dependency generation" msgstr "Generatie vereisten" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kon pakketbestand %s niet ontleden (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kon pakketbestand %s niet ontleden (2)" @@ -2385,9 +2399,9 @@ msgid "Malformed line %u in source list %s (type)" msgstr "Misvormde regel %u in bronlijst %s (type)" #: apt-pkg/sourcelist.cc:244 -#, fuzzy, c-format +#, 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" +msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format @@ -2419,7 +2433,7 @@ msgstr "" "Pakket %s moet opnieuw genstalleerd worden, maar er kan geen archief voor " "gevonden worden." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2427,9 +2441,9 @@ msgstr "" "Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan " "veroorzaakt worden door vastgehouden pakketten." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." -msgstr "Kan problemen niet verhelpen, u houdt niet-werkende pakketten vast." +msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast." #: apt-pkg/acquire.cc:62 #, c-format @@ -2443,15 +2457,15 @@ msgstr "Archiefmap %spartial is afwezig." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "" +msgstr "Bestand %li van %li wordt opgehaald (nog %s te gaan)" -#: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:832 +#, c-format msgid "Retrieving file %li of %li" -msgstr "Bestandslijst worden ingelezen" +msgstr "Bestand %li van %li wordt opgehaald" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2464,12 +2478,11 @@ msgid "Method %s did not start correctly" msgstr "Methode %s startte niet op de juiste manier" #: 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 "" -"Medium wisselen: Gelieve de schijf met label\n" -" '%s'\n" -"in het station '%s' te plaatsen en op 'enter' te drukken\n" +"Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op " +"'enter' te drukken." #: apt-pkg/init.cc:120 #, c-format @@ -2501,16 +2514,16 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "U kunt misschien 'apt-get update' uitvoeren om deze problemen te verhelpen" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Ongeldige record in het voorkeurenbestand, geen 'Package'-koptekst" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Pintype %s wordt niet begrepen" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin" @@ -2600,15 +2613,16 @@ 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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "MD5Sum komt niet overeen" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "" +"Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2617,7 +2631,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:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2626,7 +2640,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:848 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2634,7 +2648,7 @@ msgstr "" "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Grootte komt niet overeen" @@ -2688,11 +2702,16 @@ msgstr "Er wordt gescant voor indexbestanden...\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "%i pakket-indexen gevonden, %i bron-indexen en %i handtekeningen\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Opgeslagen label: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Dat is een ongeldige naam, gelieve opnieuw te proberen.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2701,20 +2720,21 @@ msgstr "" "De schijf heet:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Pakketlijsten worden gekopieerd..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Nieuwe bronlijst wordt weggeschreven\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Bronlijst-ingangen voor de schijf zijn:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "CD wordt afgekoppeld..." #: apt-pkg/indexcopy.cc:261 @@ -2740,86 +2760,55 @@ msgstr "" "bestanden\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "%s wordt geopend" +msgstr "%s wordt voorbereid" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "%s wordt geopend" +msgstr "%s wordt uitgepakt" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "Configuratiebestand %s wordt geopend" +msgstr "Configuratie van %s wordt voorbereid" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "Er wordt verbinding gemaakt met %s" +msgstr "%s wordt geconfigureerd" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Genstalleerd: " +msgstr "%s is genstalleerd" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "Verwijdering van %s wordt voorbereid" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "%s wordt geopend" +msgstr "%s wordt verwijderd" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Aanbevelingen" +msgstr "%s is verwijderd" #: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#, c-format msgid "Preparing to completely remove %s" -msgstr "Configuratiebestand %s wordt geopend" +msgstr "Volledige verwijdering van %s wordt voorbereid" #: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#, c-format msgid "Completely removed %s" -msgstr "Verwijderen van %s is mislukt" +msgstr "%s is volledig verwijderd" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Verbinding werd voortijdig afgebroken" - -#: 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/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s heeft geen voorrangsingang\n" - -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s heeft geen voorrangsingang\n" - -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Kon het bestand %s niet openen" - -#~ 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" @@ -3,15 +3,15 @@ # translation of nn.po to Norwegian Nynorsk # translation of apt.po to Norwegian Nynorsk # Gaute Hvoslef Kvalnes <gaute@verdsveven.com>, 2003. -# Hvard Korsvoll <korsvoll@skulelinux.no>, 2004, 2005. +# Havard Korsvoll <korsvoll@skulelinux.no>, 2004, 2005. # msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" -"Last-Translator: Hvard Korsvoll <korsvoll@skulelinux.no>\n" +"Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" @@ -151,7 +151,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert p %s %s\n" @@ -429,115 +429,126 @@ msgstr "Ingen utval passa" msgid "Some files are missing in the package file group `%s'" msgstr "Enkelte filer manglar i pakkefilgruppa %s" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Databasen er ydelagd. Filnamnet er endra til %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB er for gammal, forskjer oppgradere %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Klarte ikkje opna DB-fila %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Fildatoen er endra %s" +msgid "Failed to stat %s" +msgstr "Klarte ikkje f status til %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrollpost" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Klarte ikkje f peikar" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr ": Klarte ikkje lesa katalogen %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr ": Klarte ikkje f status til %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr ": " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "F: Det er feil ved fila " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Klarte ikkje sl opp %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Treklatring mislukkast" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Klarte ikkje opna %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Klarte ikkje lesa lenkja %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Klarte ikkje oppheva lenkja %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Klarte ikkje lenkja %s til %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa p %sB er ndd.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Klarte ikkje f status til %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Arkivet har ikkje noko pakkefelt" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s har inga overstyringsoppfring\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikehaldaren er %s, ikkje %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s har inga overstyringsoppfring\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s har inga overstyringsoppfring\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -801,11 +812,11 @@ msgstr "Nokre pakkar m fjernast, men fjerning er sltt av." msgid "Internal error, Ordering didn't finish" msgstr "Intern feil ved tilleggjing av avleiing" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Klarte ikkje lsa nedlastingskatalogen" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Kjeldelista kan ikkje lesast." @@ -834,7 +845,7 @@ msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" @@ -872,7 +883,7 @@ msgstr "Avbryt." msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" @@ -881,7 +892,7 @@ msgstr "Klarte ikkje henta %s %s\n" msgid "Some files failed to download" msgstr "Klarte ikkje henta nokre av filene" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" @@ -1057,115 +1068,115 @@ msgstr "ydelagde pakkar" msgid "The following extra packages will be installed:" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Fresltte pakkar:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Tilrdde pakkar" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislukkast" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Ferdig" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "M henta %sB/%sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "M henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "Du m velja minst ein pakke som byggjekrava skal sjekkast for" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1174,31 +1185,31 @@ msgstr "" "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon " "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Sttta modular:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1378,19 +1389,19 @@ msgstr "Flettar informasjon om tilgjengelege pakkar" msgid "Failed to create pipes" msgstr "Klarte ikkje oppretta ryr" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Klarte ikkje kyra gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "ydelagt arkiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-sjekksummen mislukkast, arkivet er ydelagt" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukjend TAR-hovud type %u, medlem %s" @@ -1659,27 +1670,27 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Feil CD-plate" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Klarte ikkje montera CD-plata i %s. Det kan henda plata framleis er i bruk." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 #, fuzzy msgid "Disk not found." msgstr "Fann ikkje fila" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fann ikkje fila" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Klarte ikkje f status" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Klarte ikkje setja endringstidspunkt" @@ -1807,7 +1818,7 @@ msgstr "Tidsavbrot p tilkopling til datasokkel" msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1891,124 +1902,124 @@ msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)" msgid "Unable to connect to %s %s:" msgstr "Klarte ikkje kopla til %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Klarte ikkje sl opp %s" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Klarte ikkje opna ryr for %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Lesefeil fr %s-prosessen" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Ventar p hovud" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Fekk ei enkel hovudlinje over %u teikn" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "ydelagd hovudlinje" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-tenaren sende eit ugyldig svarhovud" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-tenaren sende eit ugyldig Content-Length-hovud" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-tenaren sende eit ugyldig Content-Range-hovud" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Denne HTTP-tenaren har ydelagd sttte for omrde" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Tidsavbrot p sambandet" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Feil ved lesing fr tenaren" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "ydelagde hovuddata" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Intern feil" @@ -2081,12 +2092,12 @@ msgstr "Syntaksfeil %s:%u: Direktivet %s er ikkje sttta" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s ... Feil" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s ... Ferdig" @@ -2299,12 +2310,12 @@ msgstr "Kandidatversjonar" msgid "Dependency generation" msgstr "Genererer kravforhold" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Klarte ikkje tolka pakkefila %s (2)" @@ -2382,7 +2393,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Pakken %s m installerast p nytt, men arkivet finst ikkje." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2390,7 +2401,7 @@ msgstr "" "Feil, pkgProblemResolver::Resolve har laga brot. Dette kan skuldast pakkar " "som er haldne tilbake." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake." @@ -2407,12 +2418,12 @@ msgstr "Arkivkatalogen %spartial manglar." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:832 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Les filliste" @@ -2462,16 +2473,16 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Du vil kanskje prva retta p desse problema ved kyra apt-get update." -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Skjnar ikkje spikringstypen %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller null) oppgitt for spiker" @@ -2559,15 +2570,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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2576,7 +2587,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:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2584,14 +2595,14 @@ msgid "" msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv." -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:855 #, 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:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Feil storleik" @@ -2645,11 +2656,16 @@ msgstr "Leitar etter indeksfiler p disken ...\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Lagra etikett: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Det er ikkje eit gyldig namn, prv igjen.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2658,20 +2674,21 @@ msgstr "" "Disken vert kalla: \n" "%s\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Kopierer pakkelister ..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Skriv ny kjeldeliste\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Kjeldelisteoppfringar for denne disken er:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "Avmonterer CD-ROM ..." #: apt-pkg/indexcopy.cc:261 @@ -2748,26 +2765,12 @@ msgstr "Klarte ikkje fjerna %s" msgid "Connection closed prematurely" msgstr "Sambandet vart uventa stengd" -#: 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/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s har inga overstyringsoppfring\n" - -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s har inga overstyringsoppfring\n" +#~ msgid "File date has changed %s" +#~ msgstr "Fildatoen er endra %s" -#: methods/rred.cc:219 #, fuzzy -msgid "Could not patch file" -msgstr "Klarte ikkje opna fila %s" +#~ msgid "Could not patch file" +#~ msgstr "Klarte ikkje opna fila %s" #~ msgid "Reading file list" #~ msgstr "Les filliste" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\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" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s dla %s %s skompilowany %s %s\n" @@ -427,115 +427,126 @@ msgstr "Nie dopasowano adnej nazwy" msgid "Some files are missing in the package file group `%s'" msgstr "Brakuje pewnych plikw w grupie plikw pakietw `%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Baza bya uszkodzona, plik zosta przeniesiony do %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Baza jest przestarzaa, prbuj zaktualizowa %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nie udao si otworzy pliku DB %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Data pliku ulega zmianie %s" +msgid "Failed to stat %s" +msgstr "Nie udao si wykona operacji stat na %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archiwum nie posiada rekordu control" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Nie udao si pobra kursora" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Nie udao si odczyta katalogu %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Nie mona wykona operacji stat na %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Bdy odnosz si do pliku " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Nie udao si przetumaczy nazwy %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Przejcie po drzewie nie powiodo si" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Nie udao si otworzy %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " Odczenie %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Nie udao si odczyta dowizania %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Nie udao si usun %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Nie udao si dowiza %s do %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Osignito ograniczenie odczania %sB.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Nie udao si wykona operacji stat na %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Archiwum nie posiadao pola pakietu" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s nie posiada wpisu w pliku override\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " opiekunem %s jest %s, a nie %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s nie posiada wpisu w pliku override\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s nie posiada wpisu w pliku override\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -796,11 +807,11 @@ msgstr "Pakiety powinny zosta usunite, ale Remove jest wyczone." msgid "Internal error, Ordering didn't finish" msgstr "Bd wewntrzny, sortowanie niezakoczone" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Nie udao si zablokowa katalogu pobierania" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nie udao si odczyta list rde." @@ -829,7 +840,7 @@ msgstr "Po rozpakowaniu zostanie dodatkowo uyte %sB miejsca na dysku.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozpakowaniu zostanie zwolnione %sB miejsca na dysku.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nie udao si ustali iloci wolnego miejsca w %s" @@ -866,7 +877,7 @@ msgstr "Przerwane." msgid "Do you want to continue [Y/n]? " msgstr "Czy chcesz kontynuowa [T/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie udao si pobra %s %s\n" @@ -875,7 +886,7 @@ msgstr "Nie udao si pobra %s %s\n" msgid "Some files failed to download" msgstr "Nie udao si pobra niektrych plikw" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Ukoczono pobieranie w trybie samego pobierania" @@ -1050,112 +1061,112 @@ msgstr "Pakiety s bdne" msgid "The following extra packages will be installed:" msgstr "Zostan zainstalowane nastpujce dodatkowe pakiety:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Polecane pakiety:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Nie udao si" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Gotowe" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "Bd wewntrzny, rozwizywanie problemw wszystko popsuo" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "" "Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pobrane " "rda" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Nie udao si odnale rda dla pakietu %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pomijanie ju pobranego pliku '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczajcej iloci wolnego miejsca" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiww rde.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiww rde.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Pobierz rdo %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Nie udao si pobra niektrych archiww." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pomijanie rozpakowania ju rozpakowanego rda w %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania '%s' zawiodo.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Sprawd czy pakiet 'dpkg-dev' jest zainstalowany.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania '%s' zawiodo.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Proces potomny zawid" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" "Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pakiety " "wymagane do budowania" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Nie udao si pobra informacji o zalenociach na czas budowania dla %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zalenoci czasu budowania.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1164,7 +1175,7 @@ msgstr "" "Zaleno %s od %s nie moe zosta speniona, poniewa nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1173,32 +1184,32 @@ msgstr "" "Zaleno %s od %s nie moe zosta speniona, poniewa adna z dostpnych " "wersji pakietu %s nie ma odpowiedniej wersji" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nie udao si speni zalenoci %s od %s: Zainstalowany pakiet %s jest zbyt " "nowy" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nie udao si speni zalenoci %s od %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie udao si speni zalenoci na czas budowania od %s." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Nie udao si przetworzy zalenoci na czas budowania" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Obsugiwane moduy:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1382,19 +1393,19 @@ msgstr "czenie informacji o dostpnych pakietach" msgid "Failed to create pipes" msgstr "Nie udao si utworzy potokw" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Nie udao uruchomi programu gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Uszkodzone archiwum" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Nieznany typ nagwka TAR %u, skadnik %s" @@ -1661,25 +1672,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Niewaciwa pyta CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format 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 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Nie odnaleziono dysku." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Nie odnaleziono pliku" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Nie udao si wykona operacji stat" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Nie udao si ustawi czasu modyfikacji" @@ -1808,7 +1819,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:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Nie udao si obliczy skrtu pliku" @@ -1892,40 +1903,40 @@ msgstr "Co niegodziwego stao si przy tumaczeniu '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "Nie udao si poczy z %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Nie udao si przetumaczy nazwy '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Lista argumentw Acquire::gpgv::Options zbyt duga. Wychodzimy." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Bd wewntrzny: Prawidowa sygnatura, ale nie nie udao si ustali " "jejodcisku?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Napotkano przynajmniej jedn nieprawidow sygnatur." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, fuzzy, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr " by zweryfikowa sygnatur (czy gnupg jest zainstalowane?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Nieznany bd podczas uruchamiania gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Nastpujce sygnatury byy bdne:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1933,86 +1944,86 @@ msgstr "" "Nastpujce sygnatury nie mogy zosta zweryfikowane z powodu braku klucza " "publicznego:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Nie udao si otworzy potoku dla %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Bd odczytu z procesu %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Oczekiwanie na nagwki" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Otrzymano pojedyncz lini nagwka o dugoci ponad %u znakw" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Nieprawidowa linia nagwka" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Serwer HTTP przysa nieprawidowy nagwek odpowiedzi" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Serwer HTTP przysa nieprawidowy nagwek Content-Length" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Serwer HTTP przysa nieprawidowy nagwek Content-Range" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Ten serwer HTTP nieprawidowo obsuguje zakresy (ranges)" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Operacja select nie powioda si" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Przekroczenie czasu poczenia" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Bd przy pisaniu do pliku wyjciowego" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Bd przy pisaniu do pliku" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Bd przy pisaniu do pliku" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Bd czytania z serwera: Zdalna strona zamkna poczenie" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Bd czytania z serwera" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Bdne dane nagwka" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Poczenie nie udao si" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Bd wewntrzny" @@ -2086,12 +2097,12 @@ msgstr "Bd skadniowy %s:%u: Nieobsugiwana dyrektywa '%s'" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Bd skadniowy %s:%u: mieci na kocu pliku" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Bd!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Gotowe" @@ -2304,12 +2315,12 @@ msgstr "Kandydujce wersje" msgid "Dependency generation" msgstr "Generowanie zalenoci" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nie udao si zanalizowa pliku pakietu %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nie udao si zanalizowa pliku pakietu %s (2)" @@ -2388,7 +2399,7 @@ msgid "" msgstr "" "Pakiet %s ma zosta przeinstalowany, ale nie mona znale jego archiwum." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2396,7 +2407,7 @@ msgstr "" "Bd, pkgProblemResolver::Resolve zwrci bd, moe to by spowodowane " "\"zatrzymanymi\" pakietami." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "Nie udao si naprawi problemw, zatrzymano uszkodzone pakiety." @@ -2412,12 +2423,12 @@ msgstr "Brakuje katalogu archiww %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, fuzzy, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Pobieranie pliku %li z %li (%s pozostao)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:832 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Czytanie listy plikw" @@ -2463,16 +2474,16 @@ msgstr "Nie udao si otworzy lub zanalizowa zawartoci list pakietw." msgid "You may want to run apt-get update to correct these problems" msgstr "Naley uruchomi apt-get update aby naprawi te problemy." -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Nieprawidowy rekord w pliku ustawie, brak nagwka Package" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Nierozpoznany typ przypinania %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Brak (lub zerowy) priorytet przypicia" @@ -2563,15 +2574,16 @@ 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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "Bdna suma MD5" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +#, fuzzy +msgid "There is 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 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2580,7 +2592,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:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2589,14 +2601,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:848 +#: apt-pkg/acquire-item.cc:855 #, 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:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Bdny rozmiar" @@ -2652,11 +2664,16 @@ msgstr "" "Znaleziono %i indeksw pakietw, %i indeksw rdowych, %i indeksw " "tumacze i %i sygnatur\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Etykieta: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "To nie jest prawidowa nazwa, sprbuj ponownie.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2665,20 +2682,21 @@ msgstr "" "Pyta nosi nazw: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Kopiowanie list pakietw..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Zapisywanie nowej listy rde\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "rda dla tej pyty to:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "Odmontowanie CD-ROMu..." #: apt-pkg/indexcopy.cc:261 @@ -2755,6 +2773,9 @@ msgstr "Nie udao si usun %s" msgid "Connection closed prematurely" msgstr "Poczenie zostao zamknite przedwczenie" +#~ msgid "File date has changed %s" +#~ msgstr "Data pliku ulega zmianie %s" + #~ msgid "Reading file list" #~ msgstr "Czytanie listy plikw" @@ -1,13 +1,15 @@ # Debian-PT translation for apt. # Copyright (C) 2004 Free Software Foundation, Inc. -# Miguel Figueiredo <elmig@debianpt.org>, 2005, 2006. +# Miguel Figueiredo <elmig@debianpt.org>, 2005, 2006, 2007. +# +# msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" -"PO-Revision-Date: 2005-03-07 22:20+0000\n" -"Last-Translator: Rui Az. <astronomy@mail.pt>\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"PO-Revision-Date: 2007-05-09 22:14+0100\n" +"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -147,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado em %s %s\n" @@ -424,115 +426,128 @@ msgstr "Nenhuma selecção coincidiu" msgid "Some files are missing in the package file group `%s'" msgstr "Alguns ficheiros faltam no ficheiro de grupo de pacotes `%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "A base de dados estava corrompida, ficheiro renomeado para %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB é antiga, tentando uma actualização %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"O formato DB é inválido. Se actualizou a partir de uma versão antiga do apt, " +"por favor remova-a e recrie a base de dados." + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Não foi possível abrir o ficheiro DB %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Data do ficheiro mudou %s" +msgid "Failed to stat %s" +msgstr "Falha ao executar stat %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "O arquivo não tem registro de controle" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Não foi possível obter um cursor" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Não foi possível ler o directório %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Não foi possível fazer stat %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Erros aplicam-se ao ficheiro " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Falha ao resolver %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Falhou ao percorrer a árvore" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Falhou ao abrir %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Falhou ao executar readlink %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Falhou ao executar unlink %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Falhou ao ligar %s a %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Falha ao executar stat %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Arquivo não possuía campo pacote" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " maintainer de %s é %s, não %s\n" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s não possui fonte de entrada de 'override'\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s não possui de igual modo entrada binária de 'override'\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -793,11 +808,11 @@ msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." msgid "Internal error, Ordering didn't finish" msgstr "Erro Interno, Ordering não terminou" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Impossível criar lock no directório de download" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: 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." @@ -828,7 +843,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossível de determinar espaço livre em %s" @@ -865,7 +880,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Você deseja continuar [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao obter %s %s\n" @@ -874,7 +889,7 @@ msgstr "Falha ao obter %s %s\n" msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de apenas download" @@ -1050,111 +1065,111 @@ msgstr "Pacotes estragados" msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra serão instalados:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Pacotes sugeridos :" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Pacotes recomendados :" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Calculando Actualização... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "Erro Interno, o solucionador de problemas estragou coisas" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "" "Deve-se especificar pelo menos um pacote para que se obtenha o código fonte" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote de código fonte para %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saltando ficheiro do qual já havia sido feito download '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Obter Código Fonte %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Falha ao obter alguns arquivos." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Saltando a descompactação de pacote código fonte já descompactado em %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "O processo filho falhou" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve especificar pelo menos um pacote para verificar as dependências de " "compilação" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível obter informações de dependências de compilação para %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1163,7 +1178,7 @@ msgstr "" "a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1172,32 +1187,32 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requisitos de versão" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência %s para %s: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer a dependência %s para %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependências de compilação" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1382,19 +1397,19 @@ msgstr "Juntando informação Disponível" msgid "Failed to create pipes" msgstr "Falha ao criar pipes" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Falha ao executar gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Checksum do arquivo tar falhou, arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s" @@ -1661,25 +1676,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "CD errado" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format 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 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disco não encontrado" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Arquivo não encontrado" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Falha ao executar stat" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Falha ao definir hora de modificação" @@ -1807,7 +1822,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:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do ficheiro" @@ -1891,41 +1906,43 @@ msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "Impossível ligar a %s %s:" -#: methods/gpgv.cc:64 -#, fuzzy, c-format +#: methods/gpgv.cc:65 +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Não foi possível resolver '%s'" +msgstr "Não foi possível aceder à 'keyring': '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: A lista de argumentos de Acquire::gpgv::Options é demasiado longa. A sair." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Assinatura válida, mas não foi possível determinar a impressão " "digital da chave?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Pelo menos uma assinatura inválida foi encontrada." -#: methods/gpgv.cc:207 -#, fuzzy, c-format +#: methods/gpgv.cc:213 +#, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr " para verificar assinatura (gnupg instalado?)" +msgstr "" +"Não foi possível executar '%s' para verificar a assinatura (gnupg está " +"instalado?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Erro desconhecido ao executar gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "As seguintes assinaturas estavam inválidas:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1933,86 +1950,86 @@ msgstr "" "As seguintes assinaturas não puderam ser verificadas porque a chave pública " "não está disponível:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Não foi possível abrir pipe para %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Erro de leitura do processo %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Aguardando por cabeçalhos" -#: methods/http.cc:522 +#: methods/http.cc:523 #, 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:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Linha de cabeçalho errada" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor http enviou um cabeçalho de resposta inválido" -#: methods/http.cc:585 +#: methods/http.cc:586 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:600 +#: methods/http.cc:601 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:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Este servidor http possui suporte a range errado" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Select falhou." -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "A ligação expirou" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Erro gravando para ficheiro de saída" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Erro gravando para ficheiro" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Erro gravando para o ficheiro" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. O Remoto fechou a ligação" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Falhou a ligação" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Erro interno" @@ -2086,12 +2103,12 @@ msgstr "Erro de sintaxe %s:%u: Directiva '%s' não suportada" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra no final do ficheiro" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Erro !" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Pronto" @@ -2305,12 +2322,12 @@ msgstr "Versões Candidatas" msgid "Dependency generation" msgstr "Geração de Dependência" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossível o parse ao ficheiro de pacote %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossível o parse ao ficheiro de pacote %s (2)" @@ -2390,7 +2407,7 @@ msgstr "" "O pacote %s precisa ser reinstalado, mas não foi possível encontrar um " "repositório para o mesmo." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2398,7 +2415,7 @@ msgstr "" "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " "pacotes mantidos (hold)." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "Impossível corrigir problemas, você manteve (hold) pacotes estragados." @@ -2414,15 +2431,15 @@ msgstr "Falta o directório de repositório %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:830 +#, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "A efectuar download de ficheiro %li de %li (%s restantes)" +msgstr "A obter o ficheiro %li de %li (%s restantes)" -#: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:832 +#, c-format msgid "Retrieving file %li of %li" -msgstr "Lendo Listagem de Ficheiros" +msgstr "A obter o ficheiro %li·of·%li" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2469,16 +2486,16 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Você terá que executar apt-get update para corrigir estes problemas" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Registro inválido no ficheiro de preferências, sem cabeçalho Pacote" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Não foi possível entender o tipo de marca %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Nenhuma prioridade (ou zero) especificada para marcação" @@ -2571,17 +2588,17 @@ 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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "" "Não existe qualquer chave pública disponível para as seguintes IDs de " "chave:\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2591,7 +2608,7 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitectura " "não especificada)." -#: apt-pkg/acquire-item.cc:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2600,7 +2617,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:848 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2608,7 +2625,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Tamanho incorrecto" @@ -2662,11 +2679,16 @@ msgstr "A pesquisar os ficheiros de index do Disco..\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Encontrou %i indexes de pacotes, %indexes de source e %i assinaturas\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, c-format +msgid "Found label '%s'\n" +msgstr "Encontrada etiqueta '%s'\n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Isso não é um nome válido, tente de novo.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2675,21 +2697,21 @@ msgstr "" "Este Disco tem o nome: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "A copiar listas de pacotes..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "A escrever lista de novas source\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "As entradas de listas de Source para este Disco são:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." -msgstr "A desmontar o CD-ROM..." +#: apt-pkg/cdrom.cc:807 +msgid "Unmounting CD-ROM...\n" +msgstr "A desmontar o CD-ROM...\n" #: apt-pkg/indexcopy.cc:261 #, c-format @@ -2754,39 +2776,24 @@ msgid "Removed %s" msgstr "%s removido" #: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#, c-format msgid "Preparing to completely remove %s" -msgstr "A preparar para configurar %s" +msgstr "A preparar para remover completamente %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#, c-format msgid "Completely removed %s" -msgstr "Falha ao remover %s" +msgstr "Remoção completa de %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexão encerrada prematuramente" -#: 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/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s não possui entrada override\n" - -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s não possui entrada override\n" +#~ msgid "File date has changed %s" +#~ msgstr "Data do ficheiro mudou %s" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Não foi possível abrir ficheiro o %s" +#~ msgid "Could not patch file" +#~ msgstr "Não foi possível abrir ficheiro o %s" #~ msgid "Reading file list" #~ msgstr "Lendo Lista de Ficheiros" @@ -2849,54 +2856,41 @@ msgstr "Não foi possível abrir ficheiro o %s" #~ "Desculpe, você não tem espaço livre o suficiente em %s para guardar os ." #~ "debs." -#, fuzzy #~ msgid "Extract " #~ msgstr "extra" -#, fuzzy #~ msgid "De-replaced " #~ msgstr "Substitui" -#, fuzzy #~ msgid "Replaced file " #~ msgstr "Substitui" -#, fuzzy #~ msgid "You must give at least one file name" #~ msgstr "Você deve passar exatamente um padrão" -#, fuzzy #~ msgid "Regex compilation error" #~ msgstr "Erro de compilação de regex - %s" -#, fuzzy #~ msgid "Failed to stat %s%s" #~ msgstr "Falha ao baixar %s %s\n" -#, fuzzy #~ msgid "Failed to open %s.new" #~ msgstr "Falha ao baixar %s %s\n" -#, fuzzy #~ msgid "Failed to rename %s.new to %s" #~ msgstr "Falha ao baixar %s %s\n" -#, fuzzy #~ msgid "Couldn't wait for subprocess" #~ msgstr "Não foi possível checar a lista de pacotes fonte %s" -#, fuzzy #~ msgid " files " #~ msgstr " falhou." -#, fuzzy #~ msgid "Done. " #~ msgstr "Pronto" -#, fuzzy #~ msgid "Could not find a record in the DSC '%s'" #~ msgstr "Impossível achar pacote %s" -#, fuzzy #~ msgid "Failed too stat %s" #~ msgstr "Impossível checar %s." diff --git a/po/pt_BR.po b/po/pt_BR.po index 20c24a68c..a0e38072f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,13 +1,13 @@ # Brazilian Portuguese translation for apt. # Copyright (C) 2002 Free Software Foundation, Inc. # Gustavo Noronha Silva <kov@debian.org>, 2002. -# André Luís Lopes <andrelop@debian.org>, 2002-2005. +# Andre Luis Lopes <andrelop@debian.org>, 2002-2005. # Felipe Augusto van de Wiel (faw) <faw@cathedrallabs.org>, 2006. msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-27 00:54+0200\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" "PO-Revision-Date: 2006-08-21 00:40-0300\n" "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@cathedrallabs.org>\n" "Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n" @@ -28,8 +28,8 @@ msgid "Unable to locate package %s" msgstr "Impossível encontrar o pacote %s" #: cmdline/apt-cache.cc:232 -msgid "Total package names: " -msgstr "Total de nomes de pacotes: " +msgid "Total package names : " +msgstr "Total de Nomes de Pacotes : " #: cmdline/apt-cache.cc:272 msgid " Normal packages: " @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 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" @@ -810,11 +810,11 @@ msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada." msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, Ordenação não finalizou" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Impossível criar lock no diretório de download" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: 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." @@ -844,7 +844,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Depois de desempacotar, %sB de espaço em disco serão liberados.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" @@ -881,7 +881,7 @@ msgstr "Abortar." msgid "Do you want to continue [Y/n]? " msgstr "Quer continuar [S/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao buscar %s %s\n" @@ -890,7 +890,7 @@ msgstr "Falha ao buscar %s %s\n" msgid "Some files failed to download" msgstr "Alguns arquivos falharam ao baixar" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Baixar completo e no modo somente baixar (\"download only\")" @@ -1064,109 +1064,109 @@ msgstr "Pacotes quebrados" msgid "The following extra packages will be installed:" msgstr "Os pacotes extra a seguir serão instalados:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Pacotes sugeridos:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Pacotes recomendados:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Calculando atualização... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "Erro interno, o solucionador de problemas quebrou coisas" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote fonte para %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ignorando arquivo já obtido '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Falha ao buscar alguns arquivos." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ignorando desempacotamento de fonte já desempacotado em %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construção '%s' falhou.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Processo filho falhou" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve-se especificar pelo menos um pacote para que se cheque as dependências " "de construção" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível conseguir informações de dependência de construção para %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de construção.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1175,7 +1175,7 @@ msgstr "" "a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1184,32 +1184,32 @@ msgstr "" "a dependência de %s por %s não pôde ser satisfeita porque nenhuma versão " "disponível do pacote %s pôde satisfazer os requerimentos de versão" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer dependência de %s por %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependências de construção" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Módulos suportados:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1675,26 +1675,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "CD-ROM errado" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format 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 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disco não encontrado." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Arquivo não encontrado" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Falha ao checar" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 -#: methods/rred.cc:240 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Falha ao definir hora de modificação" @@ -1822,7 +1821,7 @@ msgstr "Conexão do socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar conexão" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do arquivo" @@ -1950,86 +1949,86 @@ msgstr "" "As assinaturas a seguir não puderam ser verificadas devido a chave pública " "não estar disponível:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Não foi possível abrir pipe para %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Erro de leitura do processo %s" -#: methods/http.cc:375 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Aguardando por cabeçalhos" -#: methods/http.cc:521 +#: methods/http.cc:523 #, 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:529 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Linha de cabeçalho ruim" -#: methods/http.cc:548 methods/http.cc:555 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido" -#: methods/http.cc:584 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "O servidor HTTP enviou um cabeçalho Content-Length inválido" -#: methods/http.cc:599 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor HTTP enviou um cabeçalho Content-Range inválido" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Este servidor HTTP possui suporte a range quebrado" -#: methods/http.cc:625 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:772 +#: methods/http.cc:774 msgid "Select failed" msgstr "Seleção falhou" -#: methods/http.cc:777 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Conexão expirou" -#: methods/http.cc:800 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Erro gravando para arquivo de saída" -#: methods/http.cc:831 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Erro gravando para arquivo" -#: methods/http.cc:859 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Erro gravando para o arquivo" -#: methods/http.cc:873 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão" -#: methods/http.cc:875 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1106 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Dados de cabeçalho ruins" -#: methods/http.cc:1123 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Conexão falhou" -#: methods/http.cc:1214 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Erro interno" @@ -2103,12 +2102,12 @@ msgstr "Erro de sintaxe %s:%u: Diretiva '%s' não suportada" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra no final do arquivo" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Erro!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Pronto" @@ -2322,12 +2321,12 @@ msgstr "Versões candidatas" msgid "Dependency generation" msgstr "Geração de dependência" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossível analisar arquivo de pacote %s (2)" @@ -2408,7 +2407,7 @@ msgstr "" "O pacote %s precisa ser reinstalado, mas não foi possível encontrar um " "arquivo para o mesmo." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2416,7 +2415,7 @@ msgstr "" "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " "pacotes mantidos (hold)." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados." @@ -2432,12 +2431,12 @@ msgstr "Diretório de repositório %spartial está faltando." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Obtendo o arquivo %li de %li (%s restantes)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:832 #, c-format msgid "Retrieving file %li of %li" msgstr "Obtendo arquivo %li de %li" @@ -2487,16 +2486,16 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Você terá que executar apt-get update para corrigir esses problemas" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Registro inválido no arquivo de preferências, sem cabeçalho Package" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Não foi possível entender o tipo de pin %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Nenhuma prioridade (ou zero) especificada para pin" @@ -2584,21 +2583,20 @@ msgstr "Coletando Arquivo Provides" msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar cache fonte" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:126 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "renomeação falhou, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 -#: apt-pkg/acquire-item.cc:1373 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:1068 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n" -#: apt-pkg/acquire-item.cc:1181 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2608,7 +2606,7 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:1240 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2617,7 +2615,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:1276 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2625,7 +2623,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:1363 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Tamanho incorreto" @@ -2681,11 +2679,16 @@ msgstr "" "Encontrado(s) %i índice(s) de pacote(s), %i índice(s) de fonte(s) e %i " "assinaturas\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Rótulo armazenado: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Este não é um nome válido, tente novamente.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2694,20 +2697,21 @@ msgstr "" "Esse disco é chamado: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Copiando lista de pacotes..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Gravando nova lista de fontes\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Entradas na lista de fontes para este disco são:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "Desmontando CD-ROM..." #: apt-pkg/indexcopy.cc:261 @@ -2782,17 +2786,15 @@ msgstr "Preparando para remover completamente %s" msgid "Completely removed %s" msgstr "%s completamente removido" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Não foi possível aplicar o patch" - #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexão encerrada prematuramente" -#: cmdline/apt-cache.cc:232 -msgid "Total package names : " -msgstr "Total de Nomes de Pacotes : " +#~ msgid "Total package names: " +#~ msgstr "Total de nomes de pacotes: " + +#~ msgid "Could not patch file" +#~ msgstr "Não foi possível aplicar o patch" #~ msgid "File date has changed %s" #~ msgstr "Data do arquivo mudou %s" @@ -2828,55 +2830,41 @@ msgstr "Total de Nomes de Pacotes : " #~ "Desculpe, você não tem espaço livre o suficiente em %s para guardar os ." #~ "debs." -#, fuzzy #~ msgid "Extract " #~ msgstr "extra" -#, fuzzy #~ msgid "De-replaced " #~ msgstr "Substitui" -#, fuzzy #~ msgid "Replaced file " #~ msgstr "Substitui" -#, fuzzy #~ msgid "You must give at least one file name" #~ msgstr "Você deve passar exatamente um padrão" -#, fuzzy #~ msgid "Regex compilation error" #~ msgstr "Erro de compilação de regex - %s" -#, fuzzy #~ msgid "Failed to stat %s%s" #~ msgstr "Falha ao baixar %s %s\n" -#, fuzzy #~ msgid "Failed to open %s.new" #~ msgstr "Falha ao baixar %s %s\n" -#, fuzzy #~ msgid "Failed to rename %s.new to %s" #~ msgstr "Falha ao baixar %s %s\n" -#, fuzzy #~ msgid "Couldn't wait for subprocess" #~ msgstr "Não foi possível checar a lista de pacotes fonte %s" -#, fuzzy #~ msgid " files " #~ msgstr " falhou." -#, fuzzy #~ msgid "Done. " #~ msgstr "Pronto" -#, fuzzy #~ msgid "Could not find a record in the DSC '%s'" #~ msgstr "Impossível achar pacote %s" -#, fuzzy #~ msgid "Failed too stat %s" #~ msgstr "Impossível checar %s." - @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-12 11:18+0200\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" "PO-Revision-Date: 2006-09-19 01:35+0300\n" "Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n" "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n" @@ -1683,25 +1683,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "CD-ROM necorespunzător" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format 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 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disc negăsit." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fişier negăsit" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:134 -#: methods/gzip.cc:143 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Eşuare de determinare a stării" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:140 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Eşuare la ajustarea timpului" @@ -1829,7 +1829,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:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemă la indexarea fişierului" @@ -1955,87 +1955,87 @@ msgstr "" "Următoarele semnături n-au putut fi verificate datorită cheii publice care " "este indisponibilă:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Nu pot deschide conexiunea pentru %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Eroare de citire din procesul %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "În aşteptarea antetelor" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Primit o singură linie de antet peste %u caractere" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Linie de antet necorespunzătoare" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Serverul http a trimis un antet de răspuns necorespunzător" -#: methods/http.cc:585 +#: methods/http.cc:586 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:600 +#: methods/http.cc:601 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:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Acest server http are zonă de suport necorespunzătoare" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Format de date necunoscut" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Eşuarea selecţiei" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Eroare la scrierea fişierului de rezultat" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Eroare la scrierea în fişier" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Eroare la scrierea în fişierul" -#: methods/http.cc:874 +#: methods/http.cc:875 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:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Eroare la citirea de pe server" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Conectare eşuată" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Eroare internă" @@ -2109,12 +2109,12 @@ msgstr "Eroare de sintaxă %s:%u: directivă nesuportată '%s'" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare la sfârşitul fişierului" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Eroare!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Terminat" @@ -2328,12 +2328,12 @@ msgstr "Versiuni candidat" msgid "Dependency generation" msgstr "Generare dependenţe" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nu pot analiza fişierul pachet %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nu pot analiza fişierul pachet %s (2)" @@ -2412,7 +2412,7 @@ msgid "" msgstr "" "Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2420,7 +2420,7 @@ msgstr "" "Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi " "cauzată de pachete ţinute." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "Nu pot corecta problema, aţi ţinut pachete deteriorate." @@ -2436,12 +2436,12 @@ msgstr "Directorul de arhive %spartial lipseşte." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, 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 +#: apt-pkg/acquire.cc:832 #, c-format msgid "Retrieving file %li of %li" msgstr "Se descarcă fişierul %li din %li" @@ -2491,16 +2491,16 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Aţi putea vrea să porniţi 'apt-get update' pentru a corecta aceste probleme." -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Înregistrare invalidă în fişierul de preferinţe, fără antet de pachet" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Nu s-a înţeles tipul de pin %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Fără prioritate (sau zero) specificată pentru pin" @@ -2593,17 +2593,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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "Nepotrivire MD5Sum" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "" "Nu există nici o cheie publică disponibilă pentru următoarele " "identificatoare de chei:\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2612,7 +2612,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:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2621,7 +2621,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:848 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2629,7 +2629,7 @@ msgstr "" "Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la " "pachetul %s." -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" @@ -2683,11 +2683,16 @@ msgstr "Scanez discul de fişierele index..\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Găsite %i indexuri de pachete, %i indexuri de surse şi %i semnături\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Etichetă memorată: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Acesta nu este un nume valid, mai încercaţi.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2696,20 +2701,21 @@ msgstr "" "Acest disc este numit: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Copiez listele de pachete.." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Scriere noua listă sursă\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Intrările listei surselor pentru acest disc sunt:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "Demontez CD-ROM..." #: apt-pkg/indexcopy.cc:261 @@ -1,25 +1,25 @@ -# translation of apt_po_ru.po to Russian +# translation of apt_0.6.46.4_ru.po to Russian # Russian messages for the apt suite. +# # Vadim Kutchin <amadis@chemi.komisc.ru>, 2002. # Ilgiz Kalmetev <ilgiz@bashtelecom.ru>, 2002. # Tichomir Koryakov <Tichomir.Koryakov@usu.ru>, 2002. # Nikolai Prokoschenko <nikolai@prokoschenko.de>, 2004. # Dmitry Astapov <adept@umc.com.ua>, 2004. # Dmitry Astapov <adept@despammed.com>, 2004. -# Yuri Kozlov <kozlov.y@gmail.com>, 2004, 2005, 2006. -# +# Yuri Kozlov <kozlov.y@gmail.com>, 2004, 2005, 2006, 2007. msgid "" msgstr "" -"Project-Id-Version: apt_po_ru\n" +"Project-Id-Version: 0.6.46.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" -"PO-Revision-Date: 2006-01-21 14:55+0300\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"PO-Revision-Date: 2007-01-03 23:33+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.9.1\n" +"X-Generator: KBabel 1.11.4\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" @@ -34,7 +34,7 @@ msgstr "Пакет %s версии %s имеет неудовлетворённ #: 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 : " @@ -86,7 +86,7 @@ msgstr "Всего информации о зависимостях: " #: cmdline/apt-cache.cc:316 msgid "Total slack space: " -msgstr "Пустого места в кэше: " +msgstr "Пустого места в кеше: " #: cmdline/apt-cache.cc:324 msgid "Total space accounted for: " @@ -99,7 +99,7 @@ msgstr "Список пакетов %s рассинхронизирован." #: cmdline/apt-cache.cc:1231 msgid "You must give exactly one pattern" -msgstr "Вы должны задать ровно один шаблон" +msgstr "Вы должны задать только один шаблон" #: cmdline/apt-cache.cc:1385 msgid "No packages found" @@ -111,7 +111,7 @@ 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 @@ -157,7 +157,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 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" @@ -206,10 +206,10 @@ msgstr "" " или: apt-cache [options] showsrc pkg1 [pkg2 ...]\n" "\n" "apt-cache - низкоуровневый инструмент, использующийся для управления\n" -"двоичными кэш-файлами APT'а, а также для извлечения информации из них\n" +"двоичными кеш-файлами APT'а, а также для извлечения информации из них\n" "Команды:\n" -" add - добавить файл пакета в кэш исходников\n" -" gencaches - построить оба кэша пакетов - бинарных и с исходными текстами\n" +" add - добавить файл пакета в кеш исходников\n" +" gencaches - построить оба кеша пакетов - бинарных и с исходными текстами\n" " showpkg - общая информация о конкретном пакете\n" " stats - основная статистика\n" " dump - показать весь файл в сжатой форме\n" @@ -226,8 +226,8 @@ msgstr "" "\n" "Опции:\n" " -h Этот текст.\n" -" -p=? Кэш пакетов.\n" -" -s=? Кэш исходников.\n" +" -p=? Кеш пакетов.\n" +" -s=? Кеш исходников.\n" " -q Не показывать индикатор прогресса.\n" " -i Показывать только важные зависимости для команды unmet.\n" " -c=? Читать указанный файл конфигурации.\n" @@ -424,7 +424,7 @@ msgstr "" " -s=? Указать файл переназначений (override) для пакетов с исходными " "текстами\n" " -q Не выводить сообщения в процессе работы\n" -" -d=? Указать кэширующую базу данных (не обязательно)\n" +" -d=? Указать кеширующую базу данных (не обязательно)\n" " --no-delink Включить режим отладки процесса удаления файлов\n" " --contents Управление генерацией полного перечня содержимого пакетов\n" " (файла Contents)\n" @@ -440,119 +440,132 @@ msgstr "Совпадений не обнаружено" msgid "Some files are missing in the package file group `%s'" msgstr "В группе пакетов `%s' отсутствуют некоторые файлы" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "БД была повреждена, файл переименован в %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB устарела, попытка обновить %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"Некорректный формат базы данных (DB). Если вы обновляли версию apt, удалите " +"и создайте базу данных заново." + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Не удалось открыть DB файл %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Дата файла %s изменилась" +msgid "Failed to stat %s" +msgstr "Не удалось получить атрибуты %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "В архиве нет поля control" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Невозможно получить курсор" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Не удалось прочитать каталог %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Не удалось прочитать атрибуты %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E: Ошибки относятся к файлу '" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Не удалось проследовать по ссылке %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Не удалось совершить обход дерева" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Не удалось открыть %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr "DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Не удалось прочесть ссылку %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Не удалось удалить %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Не удалось создать ссылку %s на %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Превышен лимит в %sB в DeLink.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Не удалось получить атрибуты %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "В архиве нет поля package" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " Нет записи о переназначении (override) для %s\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пакет %s сопровождает %s, а не %s\n" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr " Нет записи source override для %s\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " Нет записи binary override для %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" @@ -815,11 +828,11 @@ msgstr "Пакеты необходимо удалить, но удаление msgid "Internal error, Ordering didn't finish" msgstr "Внутренняя ошибка, Ordering не завершилась" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Невозможно заблокировать каталог для загрузки" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Не читается перечень источников." @@ -850,7 +863,7 @@ msgid "After unpacking %sB disk space will be freed.\n" msgstr "" "После распаковки объем занятого дискового пространства уменьшится на %sB.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не удалось определить количество свободного места в %s" @@ -889,7 +902,7 @@ msgstr "Аварийное завершение." msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось загрузить %s %s\n" @@ -898,7 +911,7 @@ msgstr "Не удалось загрузить %s %s\n" msgid "Some files failed to download" msgstr "Некоторые файлы не удалось загрузить" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Указан режим \"только загрузка\", и загрузка завершена" @@ -1019,7 +1032,7 @@ msgstr "Внутренняя ошибка, AllUpgrade все поломал" #: 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:1516 #, c-format @@ -1047,9 +1060,9 @@ msgid "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." msgstr "" -"Некоторые пакеты невозможно установить. Возможно, Вы просите невозможного,\n" -"или же используете нестабильного дистрибутив, и запрошенные Вами пакеты\n" -"ещё не созданы или были удалены из Incoming." +"Некоторые пакеты невозможно установить. Возможно, вы просите невозможного,\n" +"или же используете нестабильную версию дистрибутива, где запрошенные вами\n" +"пакеты ещё не созданы или были удалены из Incoming." #: cmdline/apt-get.cc:1569 msgid "" @@ -1057,13 +1070,13 @@ msgid "" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -"Так как Вы просили выполнить только одну операцию, то вероятнее всего, что\n" +"Так как вы просили выполнить только одну операцию, то вероятнее всего, что\n" "пакет просто не может быть установлен из-за ошибок в самом пакете.\n" "Необходимо послать отчёт об этой ошибке." #: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" -msgstr "Следующая информация возможно поможет Вам:" +msgstr "Следующая информация, возможно, поможет вам:" #: cmdline/apt-get.cc:1577 msgid "Broken packages" @@ -1073,113 +1086,113 @@ msgstr "Сломанные пакеты" msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Предлагаемые пакеты:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Расчёт обновлений... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Неудачно" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "Внутренняя ошибка, решатель проблем всё поломал" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, для которого необходимо загрузить исходные " "тексты" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходными текстами для %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаем уже загруженный файл '%s'\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Нужно загрузить %sB архивов с исходными текстами.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Загрузка исходных текстов %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось загрузить." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Распаковка исходных текстов пропущена, так как в %s уже находятся " "распакованные исходные тексты\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1188,7 +1201,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1197,32 +1210,32 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из " "версий пакета %s не удовлетворяет требованиям" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1306,7 +1319,7 @@ msgstr "" #: cmdline/acqprogress.cc:55 msgid "Hit " -msgstr "В кэше " +msgstr "В кеше " #: cmdline/acqprogress.cc:79 msgid "Get:" @@ -1405,19 +1418,19 @@ msgstr "Объединение информации о доступных пак msgid "Failed to create pipes" msgstr "Не удалось создать порождённые процессы" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Не удалось выполнить gzip " -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Повреждённый архив" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Неправильная контрольная сумма Tar, архив повреждён" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Неизвестный заголовок в архиве TAR. Тип %u, элемент %s" @@ -1448,7 +1461,7 @@ 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" @@ -1514,7 +1527,7 @@ 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" @@ -1589,8 +1602,9 @@ 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 @@ -1599,7 +1613,7 @@ msgstr "Ошибка чтения списка файлов %sinfo/%s" #: apt-inst/deb/dpkgdb.cc:266 msgid "Internal error getting a node" -msgstr "Внутренняя ошибка при получении Node" +msgstr "Внутренняя ошибка при получении node" #: apt-inst/deb/dpkgdb.cc:309 #, c-format @@ -1622,7 +1636,7 @@ msgstr "Внутренняя ошибка при добавлении diversion" #: apt-inst/deb/dpkgdb.cc:383 msgid "The pkg cache must be initialized first" -msgstr "В первую очередь должен быть проинициализирован кэш пакетов" +msgstr "В первую очередь должен быть проинициализирован кеш пакетов" #: apt-inst/deb/dpkgdb.cc:443 #, c-format @@ -1652,19 +1666,19 @@ msgstr "Это неправильный 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 "Не могу найти правильный control-файл" +msgstr "Не удалось найти правильный control-файл" #: apt-inst/deb/debfile.cc:256 msgid "Unparsable control file" -msgstr "Не могу прочесть содержимое control-файла" +msgstr "Не удалось прочесть содержимое control-файла" #: methods/cdrom.cc:114 #, c-format @@ -1683,25 +1697,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Ошибочный CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, 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 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Диск не найден." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 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 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Не удалось получить атрибуты" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Не удалось установить время модификации" @@ -1712,7 +1726,7 @@ 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" @@ -1788,7 +1802,7 @@ msgstr "Не удалось создать сокет" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" msgstr "" -"Не могу присоединиться к сокету данных, время на установление соединения " +"Не удалось присоединиться к сокету данных, время на установление соединения " "истекло" #: methods/ftp.cc:704 @@ -1805,7 +1819,7 @@ msgstr "Невозможно присоединиться к сокету" #: methods/ftp.cc:740 msgid "Could not listen on the socket" -msgstr "Не могу принимать соединения на сокете" +msgstr "Не удалось принимать соединения на сокете" #: methods/ftp.cc:747 msgid "Could not determine the socket's name" @@ -1833,9 +1847,9 @@ msgstr "Время установления соединения для соке msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "Проблема при хэшировании файла" +msgstr "Проблема при хешировании файла" #: methods/ftp.cc:877 #, c-format @@ -1900,7 +1914,7 @@ msgstr "Соединение с %s" #: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" -msgstr "Не могу найти IP адрес для %s" +msgstr "Не удалось найти IP адрес для %s" #: methods/connect.cc:173 #, c-format @@ -1918,128 +1932,128 @@ msgstr "" msgid "Unable to connect to %s %s:" msgstr "Невозможно соединиться с %s %s:" -#: methods/gpgv.cc:64 -#, fuzzy, c-format +#: methods/gpgv.cc:65 +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Не могу найти IP адрес для %s" +msgstr "Нет доступа к связке (keyring) ключей: '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Слишком большой список параметров у Acquire::gpgv::Options. Завершение " "работы." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток " "ключа?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "Найдена как минимум одна неправильная подпись." -#: methods/gpgv.cc:207 -#, fuzzy, c-format +#: methods/gpgv.cc:213 +#, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "для проверки подписи (gnupg установлена?)" +msgstr "Не удалось выполнить '%s' для проверки подписи (gnupg установлена?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Неизвестная ошибка при выполнении gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Следующие подписи неверные:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" "Следующие подписи не могут быть проверены, так как недоступен общий ключ:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Не удалось открыть канал для %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Ошибка чтения из процесса %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Ожидание заголовков" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Получен заголовок длиннее %u символов" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Неверный заголовок" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Http-сервер послал неверный заголовок" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http сервер послал неверный заголовок Content-Length" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http-сервер послал неверный заголовок Content-Range" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Неверный заголовок данных" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Внутренняя ошибка" @@ -2080,7 +2094,7 @@ 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 @@ -2114,12 +2128,12 @@ msgstr "Синтаксическая ошибка %s:%u: не поддержив msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтаксическая ошибка %s:%u: лишние символы в конце файла" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Ошибка!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Готово" @@ -2194,7 +2208,7 @@ msgstr "" #: 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 @@ -2206,7 +2220,7 @@ msgstr "" #: 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 @@ -2232,7 +2246,7 @@ 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 @@ -2259,24 +2273,24 @@ 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" @@ -2338,12 +2352,12 @@ msgstr "Версии-кандидаты" msgid "Dependency generation" msgstr "Генерирование зависимостей" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Невозможно прочесть содержимое пакета %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Невозможно прочесть содержимое пакета %s (2)" @@ -2409,7 +2423,7 @@ msgstr "" "Вследствие возникновения циклических зависимостей типа Конфликтует/" "ПредЗависит, для продолжения установки необходимо временно удалить " "существенно важный пакет %s. Это может привести к фатальным последствиям. " -"Если Вы действительно хотите продолжить, включите опцию APT::Force-LoopBreak." +"Если вы действительно хотите продолжить, включите опцию APT::Force-LoopBreak." #: apt-pkg/pkgrecords.cc:37 #, c-format @@ -2420,9 +2434,10 @@ msgstr "Не поддерживается индексный файл типа ' #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "Пакет %s нуждается в переустановке, но я не могу найти архив для него." +msgstr "" +"Пакет %s нуждается в переустановке, но найти архив для него не удалось." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2430,9 +2445,9 @@ msgstr "" "Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это " "может быть вызвано отложенными (held) пакетами." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." -msgstr "Невозможно исправить ошибки, у Вас отложены (held) битые пакеты." +msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты." #: apt-pkg/acquire.cc:62 #, c-format @@ -2446,15 +2461,15 @@ msgstr "Архивный каталог %spartial отсутствует." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:830 +#, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Загружается файл %li из %li (%s осталось)" -#: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:832 +#, c-format msgid "Retrieving file %li of %li" -msgstr "Чтение списков файлов в пакете" +msgstr "Загружается файл %li из %li" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2497,22 +2512,22 @@ msgstr "Списки пакетов или status-файл не могут бы msgid "You may want to run apt-get update to correct these problems" msgstr "Вы можете запустить 'apt-get update' для исправления этих ошибок" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Неверная запись в файле preferences: отсутствует заголовок Package" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Неизвестный тип фиксации %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Для фиксации не указан приоритет (или указан нулевой)" #: apt-pkg/pkgcachegen.cc:74 msgid "Cache has an incompatible versioning system" -msgstr "Кэш имеет несовместимую систему версий" +msgstr "Кеш имеет несовместимую систему версий" #: apt-pkg/pkgcachegen.cc:117 #, c-format @@ -2587,46 +2602,46 @@ msgstr "Сбор информации о Provides" #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" -msgstr "Ошибка ввода/вывода при попытке сохранить кэш исходных текстов" +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 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" 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:647 +msgid "There is no public key available for the following key IDs:\n" +msgstr "Недоступен общий ключ для следующих ID ключей:\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -"Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам " -"придётся вручную исправить этот пакет (возможно, пропущен arch)" +"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " +"вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:812 +#: apt-pkg/acquire-item.cc:819 #, 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:848 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s." -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Не совпадает размер" @@ -2682,11 +2697,16 @@ msgstr "" "Найдено индексов: %i для пакетов, %i для пакетов c исходными текстами\n" "и %i для сигнатур\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Найдена метка: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Это неправильное имя, попробуйте ещё раз.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2695,20 +2715,21 @@ msgstr "" "Название диска: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Копирование списков пакетов..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Запись нового списка источников\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Записи в списке источников для этого диска:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "Размонтирование CD-ROM..." #: apt-pkg/indexcopy.cc:261 @@ -2774,48 +2795,18 @@ msgid "Removed %s" msgstr "Удалён %s" #: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#, c-format msgid "Preparing to completely remove %s" -msgstr "Подготавливается для конфигурации %s" +msgstr "Подготовка к полному удалению %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#, c-format msgid "Completely removed %s" -msgstr "Не удалось удалить %s" +msgstr "%s полностью удалён" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Соединение закрыто преждевременно" -#: ftparchive/cachedb.cc:76 -msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " -"remove and re-create the database." -msgstr "" - -#: ftparchive/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " Нет записи о переназначении (override) для %s\n" - -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " Нет записи о переназначении (override) для %s\n" - -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Не могу открыть файл %s" - -#~ 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 "Could not patch file" +#~ msgstr "Не удалось пропатчить файл" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 16:17+0200\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" "PO-Revision-Date: 2006-09-10 18:50+0200\n" "Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2380 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 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" @@ -804,11 +804,11 @@ msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá." msgid "Internal error, Ordering didn't finish" msgstr "Vnútorná chyba, Triedenie sa neukončilo" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Adresár pre sťahovanie sa nedá zamknúť" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2128 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nedá sa načítať zoznam zdrojov." @@ -839,7 +839,7 @@ msgstr "Po rozbalení sa na disku použije ďalších %sB.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení sa na disku uvoľní %sB.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "Na %s sa nedá zistiť veľkosť voľného miesta" @@ -876,7 +876,7 @@ msgstr "Prerušené." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovať [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2025 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" @@ -885,7 +885,7 @@ msgstr "Zlyhalo stiahnutie %s %s\n" msgid "Some files failed to download" msgstr "Niektoré súbory sa nedajú stiahnuť" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Sťahovanie ukončené v režime \"iba stiahnuť\"" @@ -1057,116 +1057,116 @@ msgstr "Poškodené balíky" msgid "The following extra packages will be installed:" msgstr "Nainštalujú sa nasledovné extra balíky:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Odporúčané balíky:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Prepočítava sa aktualizácia... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Chyba" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "Vnútorná chyba, problem resolver pokazil veci" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1894 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:1917 cmdline/apt-get.cc:2146 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, 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:1961 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskakuje sa už stiahnutý súbor '%s'\n" -#: cmdline/apt-get.cc:1985 +#: cmdline/apt-get.cc:1992 #, 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:1990 +#: cmdline/apt-get.cc:1997 #, 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:1993 +#: cmdline/apt-get.cc:2000 #, 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:1999 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Stiahnuť zdroj %s\n" -#: cmdline/apt-get.cc:2030 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." -#: cmdline/apt-get.cc:2058 +#: cmdline/apt-get.cc:2065 #, 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:2070 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n" -#: cmdline/apt-get.cc:2071 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Skontrolujte, či je nainštalovaný balík 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2088 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz pre zostavenie '%s' zlyhal.\n" -#: cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Proces potomka zlyhal" -#: cmdline/apt-get.cc:2123 +#: cmdline/apt-get.cc:2130 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:2151 +#: cmdline/apt-get.cc:2158 #, 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:2171 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žiadne závislosti pre zostavenie.\n" -#: cmdline/apt-get.cc:2223 +#: cmdline/apt-get.cc:2230 #, 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:2275 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1175,31 +1175,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:2310 +#: cmdline/apt-get.cc:2317 #, 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:2335 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pre zostavenie %s sa nedajú splniť." -#: cmdline/apt-get.cc:2353 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí pre zostavenie zlyhalo" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2426 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1658,25 +1658,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Chybné CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format 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 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disk sa nenašiel." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Súbor sa nenašiel" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Vyhodnotenie zlyhalo" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Zlyhalo nastavenie času zmeny" @@ -1804,7 +1804,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:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashovaním súboru" @@ -1929,86 +1929,86 @@ msgstr "" "Nasledovné signatúry sa nedajú overiť, pretože nie je dostupný verejný " "kľúč:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Nedá sa otvoriť rúra pre %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Chyba pri čítaní z procesu %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Čaká sa na hlavičky" -#: methods/http.cc:522 +#: methods/http.cc:523 #, 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:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Chybná hlavička" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP server poslal neplatnú hlavičku odpovede" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP server poslal neplatnú hlavičku Content-Length" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP server poslal neplatnú hlavičku Content-Range" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má poškodenú podporu rozsahov" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Neznámy formát dátumu" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Výber zlyhal" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Uplynul čas spojenia" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Chyba pri čítaní zo servera" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Vnútorná chyba" @@ -2082,12 +2082,12 @@ msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva '%s'" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaktická chyba %s:%u: Na konci súboru sú chybné údaje" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Chyba!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Hotovo" @@ -2300,12 +2300,12 @@ msgstr "Kandidátske verzie" msgid "Dependency generation" msgstr "Generovanie závislostí" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Súbor %s sa nedá spracovať (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Súbor %s sa nedá spracovať (2)" @@ -2382,7 +2382,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Je nutné preinštalovať balík %s, ale nemôžem pre neho nájsť archív." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2390,7 +2390,7 @@ msgstr "" "Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené " "pridržanými balíkmi." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave." @@ -2406,12 +2406,12 @@ msgstr "Archívny adresár %spartial chýba." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format 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 +#: apt-pkg/acquire.cc:832 #, c-format msgid "Retrieving file %li of %li" msgstr "Sťahuje sa %li. súbor z %li" @@ -2457,16 +2457,16 @@ msgstr "Zoznamy balíkov alebo stavový súbor sa nedajú spracovať alebo otvor msgid "You may want to run apt-get update to correct these problems" msgstr "Na opravu týchto problémov môžete skúsiť spustiť apt-get update" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Neplatný záznam v súbore preferencií, žiadne záhlavie balíka" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Nezrozumiteľné pripevnenie typu %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Pre pripevnenie nebola zadaná žiadna (alebo nulová) priorita" @@ -2556,15 +2556,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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "Nezhoda MD5 súčtov" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2573,7 +2573,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:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2582,13 +2582,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:848 +#: apt-pkg/acquire-item.cc:855 #, 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:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Veľkosti sa nezhodujú" @@ -2643,11 +2643,16 @@ msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" "Nájdených %i indexov balíkov, %i indexov zdrojových balíkov a %i signatúr\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Uložená menovka: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Neplatný názov, skúste znova.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2656,20 +2661,21 @@ msgstr "" "Názov tohto disku je: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Kopírujú sa zoznamy balíkov..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Zapisuje sa nový zoznam zdrojov\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Položky zoznamu zdrojov pre tento disk sú:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM sa odpája..." #: apt-pkg/indexcopy.cc:261 @@ -2749,6 +2755,5 @@ msgstr "Spojenie bolo predčasne ukončené" #~ msgid "File date has changed %s" #~ msgstr "Dátum súboru sa zmenil %s" -#, fuzzy #~ msgid "Could not patch file" #~ msgstr "Súbor %s sa nedá otvoriť súbor" @@ -4,9 +4,9 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" -"Last-Translator: Jure uhalev <gandalf@owca.info>\n" +"Last-Translator: Jure Cuhalev <gandalf@owca.info>\n" "Language-Team: Slovenian <sl@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" @@ -145,7 +145,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s za %s %s preveden na %s %s\n" @@ -424,115 +424,126 @@ msgstr "Nobena izbira se ne ujema" msgid "Some files are missing in the package file group `%s'" msgstr "Nekatere datoteke manjkajo v skupini paketnih datotek '%s'" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "ZP je pokvarjena, datoteka je preimenovana v %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "ZP je stara, poskuam nadgraditi %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Ni mogoe odprti datoteke ZP %s: %s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "Datum datoteke se je spremenil %s" +msgid "Failed to stat %s" +msgstr "Napaka pri postavitvi %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arhiv nima nadzornega zapisa" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Ni mogoe najti kazalca" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "O: ni mogoe brati imenika %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "O: Ni mogoe nastaviti %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "O: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "N: Napake se sklicujejo na datoteko" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Ni mogoe razreiti %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Hoja drevesa ni uspela" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Ni mogoe odprti %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " RazVei %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Napaka pri branju povezave %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Napaka pri odvezovanju %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Napaka pri povezovanju %s z %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Doseena meja RazVezovanja %sB.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Napaka pri postavitvi %s" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Arhiv ni imel polja s paketom" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s nima prekrivnega vnosa\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Vzdrevalec %s je %s in ne %s\n" +#: ftparchive/writer.cc:623 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " %s nima prekrivnega vnosa\n" + +#: ftparchive/writer.cc:627 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s nima prekrivnega vnosa\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -795,11 +806,11 @@ msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoeno." msgid "Internal error, Ordering didn't finish" msgstr "Notranja napaka pri dodajanju odklona" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Ni mogoe zakleniti imenika za prenose" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Seznama virov ni mogoe brati." @@ -828,7 +839,7 @@ msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po odpakiranju bo sproenega %sB prostora na disku.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Nimate dovolj prostora na %s" @@ -865,7 +876,7 @@ msgstr "Prekini." msgid "Do you want to continue [Y/n]? " msgstr "Ali elite nadaljevati [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoe dobiti %s %s\n" @@ -874,7 +885,7 @@ msgstr "Ni mogoe dobiti %s %s\n" msgid "Some files failed to download" msgstr "Prenos nekaterih datotek ni uspel" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Prenos dokonan in uporabljen nain samo prenos" @@ -1046,118 +1057,118 @@ msgstr "Pokvarjeni paketi" msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo nameeni:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Predlagani paketi:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Priporoeni paketi:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Preraunavanje nadgradnje ... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Spodletelo" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Opravljeno" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega elite dobiti izorno kodo" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoe najti" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoe dobiti." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Otroki proces ni uspel" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega elite preveriti odvisnosti " "za gradnjo" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoe dobiti informacij o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s odvisnosti za %s ni mogoe zadostiti, ker ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1166,31 +1177,31 @@ msgstr "" "%s odvisnosti za %s ni mogoe zadostiti, ker nobena razliica paketa %s ne " "more zadostiti zahtevi po razliici" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Ni mogoe zadostiti %s odvisnosti za %s. Nameen paket %s je preve nov" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoe zadostiti %s odvisnosti za %s. %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnostim za gradnjo %s ni mogoe zadostiti." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo ni uspela" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1372,19 +1383,19 @@ msgstr "Spajanje informacij na voljo" msgid "Failed to create pipes" msgstr "Ni mogoe ustvariti pip" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Ni mogoe izvesti gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Pokvarjen arhiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Kontrolna vsota tar ni uspela, arhiv je pokvarjen" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Neznan tip glave TAR %u, lan %s" @@ -1650,26 +1661,26 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Napaen C" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Ni mogoe odklopiti CD-ROM-a v %s, ker je morda e v uporabi." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 #, fuzzy msgid "Disk not found." msgstr "Datoteke ni mogoe najti" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Datoteke ni mogoe najti" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Doloitev ni uspela" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Nastavitev asa spremembe ni uspela" @@ -1797,7 +1808,7 @@ msgstr "Povezava podatkovne vtinice potekla" msgid "Unable to accept connection" msgstr "Ni mogoe sprejeti povezave" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Teava pri razprevanju datoteke" @@ -1881,124 +1892,124 @@ msgstr "Prilo je do napake pri razreevanju '%s:%s' (%i)" msgid "Unable to connect to %s %s:" msgstr "Ni se mogoe povezati z %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, fuzzy, c-format msgid "Couldn't access keyring: '%s'" msgstr "Ni mogoe razreiti '%s'" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Naslednji dodatni paketi bodo nameeni:" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Ni mogoe odprti %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Napaka pri branju iz procesa %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "akanje na glave" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Dobljena je ena vrstica glave preko %u znakov" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Napana vrstica glave" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Strenik HTTP je poslal napano glavo odgovora" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Strenik HTTP je poslal glavo z napano dolino vsebine" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Strenik HTTP je poslal glavo z napanim obsegom vsebine" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Ta strenik HTTP ima pokvarjen obseg podpore" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "as za povezavo se je iztekel" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Napaka pri pisanju v izhodno datoteko" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika " -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Napaka pri branju s strenika" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Napani podatki glave" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Notranja napaka" @@ -2072,12 +2083,12 @@ msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Skladenjska napaka %s:%u: Dodatno smetje na koncu datoteke" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s ... Napaka!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Narejeno" @@ -2290,12 +2301,12 @@ msgstr "Razliice kandidatov" msgid "Dependency generation" msgstr "Ustvarjanje odvisnosti" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ni mogoe razleniti paketne datoteke %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni mogoe razleniti paketne datoteke %s (2)" @@ -2373,7 +2384,7 @@ msgid "" msgstr "" "Paket %s mora biti ponovno nameen, vendar ne morem najti arhiva zanj." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2381,7 +2392,7 @@ msgstr "" "Napaka. pkgProblemResolver::Napake pri razreitvi, ki so jih morda " "povzroili zadrani paketi." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "Ni mogoe popraviti teav. Imate zadrane pakete." @@ -2397,12 +2408,12 @@ msgstr "Manjka imenik z arhivi %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:832 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Branje seznama datotek" @@ -2451,16 +2462,16 @@ msgstr "Ni mogoe odprti ali razleniti seznama paketov ali datoteke stanja." msgid "You may want to run apt-get update to correct these problems" msgstr "e elite odpraviti teave, poskusite zagnati apt-get update." -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Napaen zapis v datoteki z nastavitvami. Ni glave paketa" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Ni mogoe razumeti vrste zaponke %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Prioriteta zaponke ni doloena ali pa je ni." @@ -2548,15 +2559,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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "Neujemanje vsote MD5" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2565,7 +2576,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:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2574,7 +2585,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket." -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2582,7 +2593,7 @@ msgstr "" "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket " "%s." -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Neujemanje velikosti" @@ -2636,11 +2647,16 @@ msgstr "Preverjam medij za datoteke s kazalom..\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Nael sem %i kazal paketov, %i kazal izvornih paketov in %i podpisov\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Shranjena oznaka: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "To ni veljavno ime, poskusite e enkrat.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2649,20 +2665,21 @@ msgstr "" "Ta medij se imenuje: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Kopiranje seznama paketov..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Piem nov seznam virov\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Izvorni vnosi za ta medij so:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "Odklapljam CD-ROM..." #: apt-pkg/indexcopy.cc:261 @@ -2741,26 +2758,12 @@ msgstr "Odstranitev %s ni uspela" msgid "Connection closed prematurely" msgstr "Povezava se je prezgodaj zaprla" -#: 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/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s nima prekrivnega vnosa\n" - -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s nima prekrivnega vnosa\n" +#~ msgid "File date has changed %s" +#~ msgstr "Datum datoteke se je spremenil %s" -#: methods/rred.cc:219 #, fuzzy -msgid "Could not patch file" -msgstr "Ne morem odpreti datoteke %s" +#~ msgid "Could not patch file" +#~ msgstr "Ne morem odpreti datoteke %s" #~ msgid "Reading file list" #~ msgstr "Branje seznama datotek" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" "PO-Revision-Date: 2006-08-18 15:45+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s fr %s %s kompilerad den %s %s\n" @@ -424,113 +424,131 @@ msgstr "Inga val trffades" msgid "Some files are missing in the package file group `%s'" msgstr "Ngra filer saknas i paketfilsgruppen \"%s\"" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB var skadad, filen omdpt till %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB r fr gammal, frsker uppgradera %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"DB-formatet r ogiltigt. Ta bort och terskapa databasen om du uppgraderar " +"frn en ldre version av apt." + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kunde inte ppna DB-filen %s: %s" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#, c-format +msgid "Failed to stat %s" +msgstr "Misslyckades med att ta status p %s" + +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arkivet har ingen styrpost" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Kunde inte f tag i ngon markr" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "V: Kunde inte lsa katalogen %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "V: Kunde inte ta status p %s\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "V: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "F: Felen gller filen " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "Misslyckades med att sl upp %s" # ??? -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "Trdvandring misslyckades" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "Misslyckades med att ppna %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " Avlnka %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "Misslyckades med att lsa lnk %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "Misslyckades med att lnka ut %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Misslyckades med att lnka %s till %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Avlnkningsgrns p %sB ndd.\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "Misslyckades med att ta status p %s" - # Flt vid namn "Package" -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "Arkivet har inget package-flt" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen post i override-filen\n" # parametrar: paket, ny, gammal -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ansvarig fr %s r %s ej %s\n" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s har ingen kllsidosttningspost\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s har heller ingen binr sidosttningspost\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -794,11 +812,11 @@ msgstr "Paket mste tas bort men \"Remove\" r inaktiverat." msgid "Internal error, Ordering didn't finish" msgstr "Internt fel. Sorteringen frdigstlldes inte" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Kunde inte lsa hmtningskatalogen." -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Listan ver kllor kunde inte lsas." @@ -829,7 +847,7 @@ msgstr "Efter uppackning kommer %sB ytterligare diskutrymme att anvndas.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter uppackning kommer %sB frigras p disken.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte lsa av ledigt utrymme i %s" @@ -867,7 +885,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortstta [J/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hmta %s %s\n" @@ -876,7 +894,7 @@ msgstr "Misslyckades med att hmta %s %s\n" msgid "Some files failed to download" msgstr "Misslyckades med att hmta vissa filer" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Hmtningen frdig i \"endast-hmta\"-lge" @@ -1051,107 +1069,107 @@ msgstr "Trasiga paket" msgid "The following extra packages will be installed:" msgstr "Fljande ytterligare paket kommer att installeras:" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Freslagna paket:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Rekommenderade paket:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Berknar uppgradering... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Misslyckades" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Frdig" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "Internt fel, problemlsaren brt snder saker" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "Du mste ange tminstone ett paket att hmta kllkod fr" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunde inte hitta ngot kllkodspaket fr %s" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar ver redan hmtad fil \"%s\"\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillrckligt ledigt utrymme i %s" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behver hmta %sB/%sB kllkodsarkiv.\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behver hmta %sB kllkodsarkiv.\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Hmtar kllkod %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Misslyckades med att hmta vissa arkiv." -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Packar inte upp redan redan uppackad kllkod i %s\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Kontrollera att paketet \"dpkg-dev\" r installerat.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "Du mste ange tminstone ett paket att inhmta byggberoenden fr" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hmta byggberoendeinformation fr %s" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1159,7 +1177,7 @@ msgid "" msgstr "" "%s-beroendet p %s kan inte tillfredsstllas eftersom paketet %s inte hittas" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1168,32 +1186,32 @@ msgstr "" "%s-beroendet p %s kan inte tillfredsstllas eftersom inga tillgngliga " "versioner av paketet %s uppfyller versionskraven" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Misslyckades med att uppfylla %s-beroendet fr %s: Det installerade paketet %" "s r fr nytt" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades med att uppfylla %s-beroendet fr %s: %s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden fr %s kunde inte uppfyllas." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Kunde inte hantera byggberoenden" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Moduler som stds:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1379,19 +1397,19 @@ msgstr "Lgger in tillgnglighetsinformation" msgid "Failed to create pipes" msgstr "Misslyckades med att skapa rr" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "Misslyckades med att kra gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "Frdrvat arkiv" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-kontrollsumma misslyckades, arkiv trasigt" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Oknd TAR-huvudtyp %u, del %s" @@ -1661,25 +1679,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Fel cd" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande anvnds." -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Disk ej funnen." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Filen ej funnen" -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Kunde inte ta status" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Misslyckades stta modifieringstid" @@ -1807,7 +1825,7 @@ 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:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem med att lgga filen till hashtabellen" @@ -1895,40 +1913,40 @@ msgstr "Ngot otckt hnde nr \"%s:%s\" slogs upp (%i)" msgid "Unable to connect to %s %s:" msgstr "Kunde inte ansluta till %s %s:" -#: methods/gpgv.cc:64 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "Kunde inte komma t nyckelring: \"%s\"" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Argumentslistan frn Acquire::gpgv::Options fr lng. Avslutar." -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "tminstone en giltig signatur trffades p." -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" "Kunde inte starta \"%s\" fr att verifiera signatur (r gnupg installerad?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "Oknt fel vid exekvering av gpgv" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "Fljande signaturer r ogiltiga:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1936,87 +1954,87 @@ msgstr "" "Fljande signaturer kunde inte verifieras fr att den publika nyckeln inte " "r tillgnglig:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Kunde inte ppna rr fr %s" # %s = programnamn -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Lsfel p %s-processen" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Vntar p huvuden" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Fick en ensam huvudrad p %u tecken" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Trasig huvudrad" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Http-servern snde ett ogiltigt svarshuvud" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http-servern snde ett ogiltigt Content-Length-huvud" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http-servern snde ett ogiltigt Content-Range-huvud" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Denna http-servers std fr delvis hmtning fungerar inte" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Oknt datumformat" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Tidsgrnsen fr anslutningen nddes" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Fel vid lsning frn server: Andra nden stngde frbindelsen" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Fel vid lsning frn server" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Trasigt data i huvud" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Anslutning misslyckades" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Internt fel" @@ -2089,12 +2107,12 @@ msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stds ej" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfel %s:%u: verfldigt skrp vid filens slut" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Fel!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Frdig" @@ -2311,12 +2329,12 @@ msgstr "Kandiderande versioner" msgid "Dependency generation" msgstr "Beroendegenerering" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kunde inte tolka paketfilen %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kunde inte tolka paketfilen %s (2)" @@ -2395,7 +2413,7 @@ msgid "" msgstr "" "Paketet %s mste installeras om, men jag kan inte hitta ngot arkiv fr det." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2403,7 +2421,7 @@ msgstr "" "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero p " "hllna paket." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "Kunde inte korrigera problemen, du har hllt trasiga paket." @@ -2419,12 +2437,12 @@ msgstr "Arkivkatalogen %spartial saknas." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Hmtar fil %li av %li (%s terstr)" -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:832 #, c-format msgid "Retrieving file %li of %li" msgstr "Hmtar fil %li av %li" @@ -2472,16 +2490,16 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "Du kan mjligen rtta till problemet genom att kra \"apt-get update\"" # "Package" r en strng i instllningsfilen -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Ogiltig post i instllningsfilen, \"Package\"-huvud saknas" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Frstod inte nltypen %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Prioritet ej angiven (eller noll) fr nl" @@ -2571,15 +2589,15 @@ 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:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumma stmmer inte" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is 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 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2588,7 +2606,7 @@ msgstr "" "Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du " "manuellt mste reparera detta paket (p grund av saknad arkitektur)." -#: apt-pkg/acquire-item.cc:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2597,13 +2615,13 @@ msgstr "" "Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du " "manuellt mste reparera detta paket." -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Paketindexfilerna r trasiga. Inget \"Filename:\"-flt fr paketet %s." -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Storleken stmmer inte" @@ -2657,11 +2675,16 @@ msgstr "Sker efter indexfiler p disken...\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "Hittade %i paketindex, %i kllkodsindex och %i signaturer\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Etikett: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Namnet r ogiltigt, frsk igen.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2670,20 +2693,21 @@ msgstr "" "Denna skiva heter: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Kopierar paketlistor..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Skriver ny kllista\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Poster i kllistan fr denna skiva:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "Avmonterar cd-rom..." #: apt-pkg/indexcopy.cc:261 @@ -2764,19 +2788,6 @@ msgstr "Frbindelsen stngdes i frtid" #~ msgid "File date has changed %s" #~ msgstr "Fildatumet har ndrats %s" -#~ msgid "" -#~ "DB format is invalid. If you upgraded from a older version of apt, please " -#~ "remove and re-create the database." -#~ msgstr "" -#~ "DB-formatet r ogiltigt. Ta bort och terskapa databasen om du " -#~ "uppgraderar frn en ldre version av apt." - -#~ msgid " %s has no source override entry\n" -#~ msgstr " %s har ingen kllsidosttningspost\n" - -#~ msgid " %s has no binary override entry either\n" -#~ msgstr " %s har heller ingen binr sidosttningspost\n" - #~ msgid "Could not patch file" #~ msgstr "Kunde inte lgga p programfix p filen" @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 16:17+0200\n" -"PO-Revision-Date: 2006-03-16 15:53+0800\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n" "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n" "MIME-Version: 1.0\n" @@ -152,7 +152,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2380 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 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" @@ -449,6 +449,8 @@ msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" +"Hindi tanggap ang anyo ng DB. Kung kayo ay nagsariwa mula sa nakaraang " +"bersiyon ng apt, tanggalin at likhain muli ang database." #: ftparchive/cachedb.cc:81 #, c-format @@ -545,14 +547,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " Tagapangalaga ng %s ay %s hindi %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s ay walang override entry\n" +msgstr " %s ay walang override entry para sa pinagmulan\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s ay walang override entry\n" +msgstr " %s ay wala ring override entry na binary\n" #: ftparchive/contents.cc:317 #, c-format @@ -818,11 +820,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "Hindi maaldaba ang directory ng download" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2128 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)." @@ -854,7 +856,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "Hindi matantsa ang libreng puwang sa %s" @@ -891,7 +893,7 @@ msgstr "Abort." msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2025 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" @@ -900,7 +902,7 @@ msgstr "Bigo sa pagkuha ng %s %s\n" msgid "Some files failed to download" msgstr "May mga talaksang hindi nakuha" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" @@ -1075,107 +1077,107 @@ msgstr "Sirang mga pakete" msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "Sinusuri ang pag-upgrade... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Bigo" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "Tapos" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1894 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:1917 cmdline/apt-get.cc:2146 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Linaktawan ang nakuha na na talaksan '%s'\n" -#: cmdline/apt-get.cc:1985 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" -#: cmdline/apt-get.cc:1990 +#: cmdline/apt-get.cc:1997 #, 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:1993 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:1999 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:2030 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "Bigo sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:2058 +#: cmdline/apt-get.cc:2065 #, 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:2070 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Bigo ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:2071 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2088 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay bigo.\n" -#: cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "Bigo ang prosesong anak" -#: cmdline/apt-get.cc:2123 +#: cmdline/apt-get.cc:2130 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:2151 +#: cmdline/apt-get.cc:2158 #, 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:2171 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" -#: cmdline/apt-get.cc:2223 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1184,7 +1186,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:2275 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1193,32 +1195,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:2310 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %" "s ay bagong-bago pa lamang." -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:2353 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "Bigo sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: cmdline/apt-get.cc:2426 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1681,25 +1683,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "Maling CD" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format 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 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Hindi nahanap ang Disk." -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Hindi Nahanap ang Talaksan" -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Bigo ang pag-stat" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Bigo ang pagtakda ng oras ng pagbago" @@ -1783,11 +1785,11 @@ msgstr "Hindi maka-likha ng socket" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "Hindi maka-konek sa socket ng datos, nag-time-out ang koneksyon" +msgstr "Hindi maka-konekta sa socket ng datos, nag-time-out ang koneksyon" #: methods/ftp.cc:704 msgid "Could not connect passive socket." -msgstr "Hindi maka-konek sa socket na passive." +msgstr "Hindi maka-konekta sa socket na passive." #: methods/ftp.cc:722 msgid "getaddrinfo was unable to get a listening socket" @@ -1827,7 +1829,7 @@ msgstr "Nag-timeout ang socket ng datos" msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng talaksan" @@ -1857,7 +1859,7 @@ msgstr "Hindi ma-invoke " #: methods/connect.cc:64 #, c-format msgid "Connecting to %s (%s)" -msgstr "Kumokonek sa %s (%s)" +msgstr "Kumokonekta sa %s (%s)" #: methods/connect.cc:71 #, c-format @@ -1877,19 +1879,19 @@ msgstr "Hindi maumpisahan ang koneksyon sa %s:%s (%s)." #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "Hindi maka-konek sa %s:%s (%s), nag-timeout ang koneksyon" +msgstr "Hindi maka-konekta sa %s:%s (%s), nag-timeout ang koneksyon" #: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." -msgstr "Hindi maka-konek sa %s:%s (%s)." +msgstr "Hindi maka-konekta sa %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 "Kumokonek sa %s" +msgstr "Kumokonekta sa %s" #: methods/connect.cc:167 #, c-format @@ -1909,12 +1911,12 @@ msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)" #: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" -msgstr "Hindi maka-konek sa %s %s:" +msgstr "Hindi maka-konekta sa %s %s:" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Hindi maresolba ang '%s'" +msgstr "Hindi mabasa ang keyring: '%s'" #: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." @@ -1934,9 +1936,10 @@ msgid "At least one invalid signature was encountered." msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro." #: methods/gpgv.cc:213 -#, fuzzy, c-format +#, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr " upang maberipika ang lagda (nakaluklok ba ang gnupg?)" +msgstr "" +"Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gnupg?)" #: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" @@ -1954,86 +1957,86 @@ msgstr "" "Ang sumusunod na mga lagda ay hindi maberipika dahil ang public key ay hindi " "available:\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Hindi makapag-bukas ng pipe para sa %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Error sa pagbasa mula sa prosesong %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Naghihintay ng panimula" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Maling linyang panimula" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Nagpadala ang HTTP server ng di tanggap na reply header" -#: methods/http.cc:585 +#: methods/http.cc:586 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:600 +#: methods/http.cc:601 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:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Sira ang range support ng HTTP server na ito" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Bigo ang pagpili" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Error sa pagsulat ng talaksang output" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Maling datos sa panimula" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Bigo ang koneksyon" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Internal na error" @@ -2107,12 +2110,12 @@ msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntax error %s:%u: May basura sa dulo ng talaksan" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Error!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Tapos" @@ -2330,12 +2333,12 @@ msgstr "Bersyong Kandidato" msgid "Dependency generation" msgstr "Pagbuo ng Dependensiya" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Hindi ma-parse ang talaksang pakete %s (2)" @@ -2415,7 +2418,7 @@ msgstr "" "Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo " "para dito." -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2423,7 +2426,7 @@ msgstr "" "Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot " "ito ng mga paketeng naka-hold." -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold." @@ -2440,15 +2443,15 @@ msgstr "Nawawala ang directory ng arkibo %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:830 +#, 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 +#: apt-pkg/acquire.cc:832 +#, c-format msgid "Retrieving file %li of %li" -msgstr "Binabasa ang Talaksang Listahan" +msgstr "Kinukuha ang talaksang %li ng %li" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2495,16 +2498,16 @@ msgstr "" "Maaaring patakbuhin niyo ang apt-get update upang ayusin ang mga problemang " "ito" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Hindi naintindihan ang uri ng pin %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Walang prioridad (o sero) na nakatakda para sa pin" @@ -2594,15 +2597,15 @@ msgstr "IO Error sa pag-imbak ng source cache" msgid "rename failed, %s (%s -> %s)." msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "Di tugmang MD5Sum" -#: 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:647 +msgid "There is no public key available for the following key IDs:\n" +msgstr "Walang public key na magamit para sa sumusunod na key ID:\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2611,7 +2614,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)" -#: apt-pkg/acquire-item.cc:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2620,7 +2623,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito." -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2628,7 +2631,7 @@ msgstr "" "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Di tugmang laki" @@ -2684,11 +2687,16 @@ msgstr "" "Nakahanap ng %i na index ng mga pakete, %i na index ng source at %i na " "signature\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Naka-imbak na Label: %s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "Hindi yan tanggap na pangalan, subukan muli.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2697,20 +2705,21 @@ msgstr "" "Ang Disc na ito ay nagngangalang: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Kinokopya ang Listahan ng mga Pakete" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Sinusulat ang bagong listahan ng pagkukunan\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "Ina-unmount ang CD-ROM..." #: apt-pkg/indexcopy.cc:261 @@ -2776,26 +2785,25 @@ msgid "Removed %s" msgstr "Tinanggal ang %s" #: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#, c-format msgid "Preparing to completely remove %s" -msgstr "Hinahanda ang %s upang isaayos" +msgstr "Naghahanda upang tanggalin ng lubusan ang %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#, c-format msgid "Completely removed %s" -msgstr "Bigo sa pagtanggal ng %s" +msgstr "Natanggal ng lubusan ang %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Nagsara ng maaga ang koneksyon" +#~ msgid "Could not patch file" +#~ msgstr "Hindi mai-patch ang talaksan" + #~ msgid "File date has changed %s" #~ msgstr "Nagbago ang petsa ng talaksang %s" -#, fuzzy -#~ msgid "Could not patch file" -#~ msgstr "Hindi mabuksan ang talaksang %s" - #~ msgid "Reading file list" #~ msgstr "Binabasa ang Talaksang Listahan" @@ -1,20 +1,20 @@ # Vietnamese Translation for Apt. # This file is put in the public domain. -# Clytie Siddall <clytie@riverland.net.au>, 2005, 2006. +# Clytie Siddall <clytie@riverland.net.au>, 2005, 2006, 2007. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-12 11:18+0200\n" -"PO-Revision-Date: 2006-09-21 17:16+0930\n" +"POT-Creation-Date: 2007-05-08 11:09+0200\n" +"PO-Revision-Date: 2007-06-01 15:00+0930\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <vi-VN@googlegroups.com>\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.6fc1\n" +"X-Generator: LocFactoryEditor 1.6.3b1\n" #: cmdline/apt-cache.cc:135 #, c-format @@ -1709,25 +1709,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "CD không đúng" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, 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 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "Không tìm thấy đĩa" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 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:281 methods/gzip.cc:134 -#: methods/gzip.cc:143 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "Việc lấy các thông tin bị lỗi" -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:140 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Việc lập giờ sửa đổi bị lỗi" @@ -1855,7 +1855,7 @@ msgstr "Kết nối ổ cắm dữ liệu đã quá giờ" 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 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Gặp khó khăn băm tập tin" @@ -1978,90 +1978,90 @@ msgid "" 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 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "Không thể mở ống dẫn cho %s" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Gặp lỗi đọc từ tiến trình %s" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Đang đợi những phần đầu..." -#: methods/http.cc:522 +#: methods/http.cc:523 #, 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 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Dòng đầu sai" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 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 +#: methods/http.cc:586 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 +#: methods/http.cc:601 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 +#: methods/http.cc:603 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 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Không biết dạng ngày" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Việc chọn bị lỗi" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Kết nối đã quá giờ" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Gặp lỗi khi ghi vào tập tin xuất" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Gặp lỗi khi ghi vào tập tin đó" -#: methods/http.cc:874 +#: methods/http.cc:875 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 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Gặp lỗi khi đọc từ máy phục vụ" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "Dữ liệu dòng đầu sai" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "Kết nối bị ngắt" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "Gặp lỗi nội bộ" @@ -2134,12 +2134,12 @@ msgstr "Gặp lỗi cú pháp %s:%u: chưa hỗ trợ chỉ thị « %s »" 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 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Lỗi." -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Xong" @@ -2352,12 +2352,12 @@ msgstr "Phiên bản ứng cử" msgid "Dependency generation" msgstr "Tạo ra cách phụ thuộc" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Không thể phân tách tập tin gói %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:193 #, 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)" @@ -2438,7 +2438,7 @@ 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 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2446,7 +2446,7 @@ 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 +#: apt-pkg/algorithms.cc:1068 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." @@ -2462,12 +2462,12 @@ msgstr "Thiếu thư mục kho « %spartial »." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Đang lấy tập tin %li trên %li (%s còn lại)..." -#: apt-pkg/acquire.cc:825 +#: apt-pkg/acquire.cc:832 #, c-format msgid "Retrieving file %li of %li" msgstr "Đang lấy tập tin %li trên %li..." @@ -2516,18 +2516,18 @@ 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 +#: apt-pkg/policy.cc:270 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 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "Không hiểu kiểu ghim %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim" @@ -2617,15 +2617,15 @@ msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" 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 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 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" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2634,7 +2634,7 @@ 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 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2643,7 +2643,7 @@ 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 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2651,7 +2651,7 @@ 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 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "Kích cỡ không khớp được" @@ -2705,11 +2705,16 @@ msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n" 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 +#: apt-pkg/cdrom.cc:683 +#, c-format +msgid "Found label '%s'\n" +msgstr "Nhãn đã lưu : « %s »\n" + +#: apt-pkg/cdrom.cc:712 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 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2718,21 +2723,21 @@ msgstr "" "Tên đĩa này:\n" "%s\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "Đang sao chép các danh sách gói..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "Đang ghi danh sách nguồn mới...\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 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/cdrom.cc:807 +msgid "Unmounting CD-ROM...\n" +msgstr "Đang tháo lắp đĩa CD-ROM...\n" #: apt-pkg/indexcopy.cc:261 #, c-format diff --git a/po/zh_CN.po b/po/zh_CN.po index c38c5f0f4..439e058a9 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,15 +1,15 @@ # Chinese/Simplified translation of apt. # This file is put in the public domain. -# Tchaikov <tchaikov@sjtu.edu.cn>, 2005. +# Tchaikov <tchaikov@sjtu.org>, 2005,2007. # 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: 2006-05-27 13:46+0200\n" -"PO-Revision-Date: 2006-02-22 14:20+1300\n" -"Last-Translator: Carlos Z.F. Liu <carlosliu@users.sourceforge.net>\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"PO-Revision-Date: 2007-03-29 17:14+0800\n" +"Last-Translator: Kov Chai <tchaikov@sjtu.org>\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" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s ，编译于 %s %s\n" @@ -422,115 +422,127 @@ msgstr "没有任何选定项是匹配的" msgid "Some files are missing in the package file group `%s'" msgstr "软件包文件组“%s”中缺少一些文件" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "缓存数据库被损坏了，该数据库文件的文件名已改成 %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB 已过时，现试图进行升级 %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"DB 格式是无效的。如果你是从一个老版本的 apt 升级而来，请删除数据库并重建它。" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "无法打开 DB 文件 %s：%s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "文件 %s 的时间已被改动" +msgid "Failed to stat %s" +msgstr "无法读取 %s 的状态" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "存档没有包含控制字段" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "无法获得游标(cursor)" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "警告：无法读取目录 %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "警告：无法对 %s 进行统计\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "错误：" -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "警告：" -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "错误：处理文件时出错 " -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "无法解析路径 %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "无法遍历目录树" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "无法打开 %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "无法读取符号链接 %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "无法 unlink %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** 无法将 %s 链接到 %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " 达到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "无法读取 %s 的状态" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "存档没有包含软件包(package)字段" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s 中没有 override 项\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的维护者 %s 并非 %s\n" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s 没有源代码的 override 项\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s 中没有二进制文件的 override 项\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -789,13 +801,13 @@ msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止 #: cmdline/apt-get.cc:775 msgid "Internal error, Ordering didn't finish" -msgstr "内部错误，Ordering 没有完成" +msgstr "内部错误，Ordering 未能完成" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "无法对下载目录加锁" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "无法读取安装源列表。" @@ -824,7 +836,7 @@ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的空余空间" @@ -861,7 +873,7 @@ msgstr "中止执行。" msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n]" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" @@ -870,7 +882,7 @@ msgstr "无法下载 %s %s\n" msgid "Some files failed to download" msgstr "有一些文件下载失败" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" @@ -1040,114 +1052,114 @@ msgstr "无法安装的软件包" msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包：" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "推荐安装的软件包：" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "正在筹划升级... " -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" msgstr "内部错误，problem resolver 坏事了" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1968 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的空余空间" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1156,30 +1168,30 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1" "$s 依赖关系" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新了" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "被支持模块：" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1356,19 +1368,19 @@ msgstr "正在合并现有信息" msgid "Failed to create pipes" msgstr "无法创建管道" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "无法执行 gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "包文件已被损坏" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "tar 的校验码不符，包文件已被损坏" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "未知的 TAR 数据头类型 %u，成员 %s" @@ -1634,25 +1646,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "错误的光盘" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。" -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "找不到光盘。" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 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 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "无法读取状态" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "无法设置文件的修改日期" @@ -1779,7 +1791,7 @@ msgstr "数据套接字连接超时" msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "把文件加入散列表时出错" @@ -1863,123 +1875,123 @@ msgstr "解析“%s:%s”时，出现了某些故障 (%i)" msgid "Unable to connect to %s %s:" msgstr "不能连接上 %s %s：" -#: methods/gpgv.cc:64 -#, fuzzy, c-format +#: methods/gpgv.cc:65 +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "无法解析域名“%s”" +msgstr "无法访问密匙：“%s”" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "至少发现一个无效的签名。" -#: methods/gpgv.cc:207 -#, fuzzy, c-format +#: methods/gpgv.cc:213 +#, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "用于验证签名(您安装了 gnupg 么？)" +msgstr "无法运行\"%s\"以便验证签名(您安装了 gnupg 么？)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "运行 gpgv 时发生未知错误" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "下列签名无效：\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "由于没有公钥，下列签名无法进行验证：\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "无法为 %s 开启管道" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "从 %s 进程读取数据出错" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "正在等待报头" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "受到了一行报头条目，它的长度超过了 %u 个字符" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "错误的报头条目" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "该 http 服务器发送了一个无效的应答报头" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "该 http 服务器发送了一个无效的 Content-Length 报头" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "该 http 服务器发送了一个无效的 Content-Range 报头" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "该 http 服务器的 range 支持不正常" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "连接服务器超时" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "写文件时出错" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "写文件时出错" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "内部错误" @@ -2052,12 +2064,12 @@ msgstr "语法错误 %s:%u: 不支持的指令“%s”" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... 有错误!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... 完成" @@ -2270,12 +2282,12 @@ msgstr "候选版本" msgid "Dependency generation" msgstr "生成依赖关系" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "无法解析软件包文件 %s (1)" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "无法解析软件包文件 %s (2)" @@ -2352,7 +2364,7 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。" -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2360,7 +2372,7 @@ msgstr "" "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的" "缘故。" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "" "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关" @@ -2378,15 +2390,15 @@ msgstr "找不到“%spartial”这个目录。" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:830 +#, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "正在下载第 %li 个文件(共 %li 个，尚需 %s)" +msgstr "正在下载 %li 个文件中的第 %li 个(还有 %s 个)" -#: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:832 +#, c-format msgid "Retrieving file %li of %li" -msgstr "正在读取文件列表" +msgstr "正在下载 %2$li 个文件中的 %1$li 个" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2429,16 +2441,16 @@ msgstr "无法解析或打开软件包的列表或是状态文件。" msgid "You may want to run apt-get update to correct these problems" msgstr "您可能需要运行 apt-get update 来解决这些问题" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "偏好设定(preferences)文件中发现有无效的记录，无 Package 字段头" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "无法识别锁定的类型(pin type) %s" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "没有为版本锁定指定优先级(或为零)" @@ -2526,15 +2538,15 @@ msgstr "无法写入来源缓存文件" msgid "rename failed, %s (%s -> %s)." msgstr "无法重命名文件，%s (%s -> %s)。" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 msgid "MD5Sum mismatch" msgstr "MD5 校验和不符" -#: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" msgstr "以下 key ID 没有可用的公钥：\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2543,7 +2555,7 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:812 +#: apt-pkg/acquire-item.cc:819 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2551,13 +2563,13 @@ msgid "" msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "大小不符" @@ -2611,11 +2623,16 @@ msgstr "正在光盘中查找索引文件..\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "找到了 %i 个软件包索引、%i 个源代码包索引，和 %i 个数字签名\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "存档标签：%s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "这不是一个有效的名字，请再次命名。\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2624,20 +2641,21 @@ msgstr "" "这张光盘现在的名字是：\n" "“%s”\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "正在复制软件包列表……" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "正在写入新的软件包源列表\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "对应于该光盘的软件包源设置项是：\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "正在卸载 CD-ROM 文件系统……" #: apt-pkg/indexcopy.cc:261 @@ -2701,39 +2719,24 @@ msgid "Removed %s" msgstr "已删除 %s" #: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#, c-format msgid "Preparing to completely remove %s" -msgstr "正在准备配置 %s" +msgstr "正在准备完全删除 %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#, c-format msgid "Completely removed %s" -msgstr "无法删除 %s" +msgstr "完全删除了 %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "连接被永久关闭" -#: ftparchive/cachedb.cc:76 -msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " -"remove and re-create the database." -msgstr "" - -#: ftparchive/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s 中没有 override 项\n" +#~ msgid "Could not patch file" +#~ msgstr "无法打开补丁文件" -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s 中没有 override 项\n" - -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "无法打开文件 %s" +#~ msgid "File date has changed %s" +#~ msgstr "文件 %s 的时间已被改动" #~ msgid "Reading file list" #~ msgstr "正在读取文件列表" diff --git a/po/zh_TW.po b/po/zh_TW.po index 2057703ff..3b1329fab 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" -"PO-Revision-Date: 2005-02-19 22:24+0800\n" +"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"PO-Revision-Date: 2006-10-21 16:58+0800\n" "Last-Translator: Asho Yeh <asho@debian.org.tw>\n" "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n" "MIME-Version: 1.0\n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2387 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" @@ -230,19 +230,15 @@ msgstr "" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" +msgstr "請給這張光碟取個名字，比如說“Debian 2.1r1 Disk 1”" #: cmdline/apt-cdrom.cc:93 -#, fuzzy msgid "Please insert a Disc in the drive and press enter" -msgstr "" -"更換媒體:請把名為\n" -" '%s' 的光碟\n" -"插入 '%s' 碟機,然後按 [Enter] 鍵。\n" +msgstr "請放入光碟至光碟機，然後按 [Enter] 鍵。" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "" +msgstr "請對您的光碟套件中的其它光碟重復相同的操作。" #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" @@ -339,7 +335,6 @@ msgid "Error processing contents %s" msgstr "處理目錄 %s 時出錯" #: ftparchive/apt-ftparchive.cc:556 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -428,115 +423,126 @@ msgstr "找不到符合的選項" msgid "Some files are missing in the package file group `%s'" msgstr "套件檔案組 `%s' 缺少部份檔案" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB 已損毀,檔案被更名成 %s.old" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB 過舊,嘗試更新 %s" -#: ftparchive/cachedb.cc:73 +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "資料庫格式錯誤。如果您升級舊版的 apt，請移除並重建資料庫。" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "無法開啟 DB 檔案 %s:%s" -#: ftparchive/cachedb.cc:114 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format -msgid "File date has changed %s" -msgstr "檔案資料已更改 %s" +msgid "Failed to stat %s" +msgstr "無法取得 %s 的狀態" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "檔案沒有 control 記錄" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "無法取得游標" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W:無法讀取目錄 %s\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "W:無法取得 %s 狀態\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "錯誤：" -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "警告：" -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "E:套用到檔案時出錯" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "無法解析路徑 %s" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "無法走訪目錄樹" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "無法開啟 %s" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " 移除連結 %s [%s]\n" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "無法讀取符號鏈接 %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "無法 unlink %s" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** 無法將 %s 鏈接到 %s" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " 達到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266 -#, c-format -msgid "Failed to stat %s" -msgstr "無法取得 %s 的狀態" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "檔案無套件字符" -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr " %s 無 override 項目\n" -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 套件維護者是 %s 非 %s\n" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s 無原始碼 override 項目\n" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s 無二元碼 override 項目\n" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -705,12 +711,11 @@ msgid "%s (due to %s) " msgstr "%s（因為 %s）" #: cmdline/apt-get.cc:546 -#, fuzzy 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:577 @@ -772,7 +777,7 @@ msgstr "警告：下列的套件驗證失敗！" #: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "忽略了認證警告。\n" #: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " @@ -788,29 +793,28 @@ msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes" #: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "內部錯誤，InstallPackages 被用在了無法安裝的套上！" #: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "有套件需要被移除,但移除動作被禁止。" #: cmdline/apt-get.cc:775 -#, fuzzy msgid "Internal error, Ordering didn't finish" -msgstr "內部錯誤：新增轉移(diversion)失敗" +msgstr "內部錯誤，Ordering didn't finish" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 msgid "Unable to lock the download directory" msgstr "無法鎖定下載的目錄" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 #: 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 "" +msgstr "怪了……檔案大小不符，發信給 apt@packages.debian.org 吧" #: cmdline/apt-get.cc:821 #, c-format @@ -832,10 +836,10 @@ msgstr "解壓縮後將消耗 %sB 的空間。\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "解壓縮後將空出 %sB 的空間。\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 -#, fuzzy, c-format +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#, c-format msgid "Couldn't determine free space in %s" -msgstr "『%s』內沒有足夠的空間。" +msgstr "%s 無法足夠的空間。" #: cmdline/apt-get.cc:849 #, c-format @@ -851,7 +855,7 @@ msgid "Yes, do as I say!" msgstr "是的,請執行我所指定的" #: cmdline/apt-get.cc:868 -#, fuzzy, c-format +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" @@ -869,7 +873,7 @@ msgstr "放棄執行。" msgid "Do you want to continue [Y/n]? " msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 #, c-format msgid "Failed to fetch %s %s\n" msgstr "無法下載『%s』檔案。%s\n" @@ -878,7 +882,7 @@ msgstr "無法下載『%s』檔案。%s\n" msgid "Some files failed to download" msgstr "部份檔案無法下載" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 msgid "Download complete and in download only mode" msgstr "下載完畢,目前是“僅下載”模式" @@ -1048,115 +1052,114 @@ msgstr "損毀的套件" msgid "The following extra packages will be installed:" msgstr "下列的【新】套件都將被安裝：" -#: cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1692 msgid "Suggested packages:" msgstr "建議(Suggested)的套件:" -#: cmdline/apt-get.cc:1675 +#: cmdline/apt-get.cc:1693 msgid "Recommended packages:" msgstr "推薦(Recommended)的套件:" -#: cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:1713 msgid "Calculating upgrade... " msgstr "籌畫升級套件中..." -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:1703 +#: cmdline/apt-get.cc:1721 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 -#, fuzzy +#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 msgid "Internal error, problem resolver broke stuff" -msgstr "內部錯誤,AllUpgrade 造成錯誤" +msgstr "內部錯誤，problem resolver 處理失敗" -#: cmdline/apt-get.cc:1876 +#: cmdline/apt-get.cc:1894 msgid "Must specify at least one package to fetch source for" msgstr "必須指定至少一個對應的套件才能下載源碼" -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 #, c-format msgid "Unable to find a source package for %s" msgstr "無法找到 %s 套件的源碼" -#: cmdline/apt-get.cc:1950 -#, fuzzy, c-format +#: cmdline/apt-get.cc:1968 +#, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "略過已經被解開到 %s 目錄的源碼檔案\n" +msgstr "略過已被下載的檔案“%s”\n" -#: cmdline/apt-get.cc:1974 +#: cmdline/apt-get.cc:1992 #, c-format msgid "You don't have enough free space in %s" msgstr "『%s』內沒有足夠的空間。" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1997 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n" -#: cmdline/apt-get.cc:1982 +#: cmdline/apt-get.cc:2000 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下載 %sB 的原始檔案。\n" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Fetch source %s\n" msgstr "下載源碼 %s\n" -#: cmdline/apt-get.cc:2019 +#: cmdline/apt-get.cc:2037 msgid "Failed to fetch some archives." msgstr "無法下載某些檔案。" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2065 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "略過已經被解開到 %s 目錄的源碼檔案\n" -#: cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "執行解開套件指令 '%s' 時失敗。\n" -#: cmdline/apt-get.cc:2060 +#: cmdline/apt-get.cc:2078 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "請檢查是否安裝了“dpkg-dev”套件。\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2095 #, c-format msgid "Build command '%s' failed.\n" msgstr "執行建立套件指令 '%s' 時失敗。\n" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2114 msgid "Child process failed" msgstr "子程序失敗" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2130 msgid "Must specify at least one package to check builddeps for" msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)" -#: cmdline/apt-get.cc:2140 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "無法取得 %s 的建構相依關係。" -#: cmdline/apt-get.cc:2160 +#: cmdline/apt-get.cc:2178 #, c-format msgid "%s has no build depends.\n" msgstr "%s 無建立相依關係訊息。\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2230 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由於無法找到套件 %3$s ,因此不能滿足 %2$s 所要求的 %1$s 相依關係" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2282 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1165,30 +1168,30 @@ msgstr "" "由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的" "相依關係" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:已安裝的套件 %3$s 太新了" -#: cmdline/apt-get.cc:2324 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2356 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "無法滿足套件 %s 所要求的建構相依關係。" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2360 msgid "Failed to process build dependencies" msgstr "無法處理建構相依關係" -#: cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2392 msgid "Supported modules:" msgstr "支援模組:" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2433 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1367,19 +1370,19 @@ msgstr "結合現有資料中" msgid "Failed to create pipes" msgstr "無法建立管線" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "無法執行 gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "損毀的檔案" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "Tar checksum 失敗,檔案已損毀" -#: apt-inst/contrib/extracttar.cc:298 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "未知的 TAR 標頭型別 %u, member 訊息 %s" @@ -1436,7 +1439,7 @@ 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 失敗" @@ -1645,26 +1648,25 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "碟片不正確。" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "無法下駕『%s』內的碟片，或許它仍在使用中。" -#: methods/cdrom.cc:169 -#, fuzzy +#: methods/cdrom.cc:171 msgid "Disk not found." -msgstr "找不到檔案" +msgstr "找不到磁碟" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 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 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 msgid "Failed to stat" msgstr "無法讀取資料" -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "日期更新失敗" @@ -1790,7 +1792,7 @@ msgstr "Data socket 連線逾時" msgid "Unable to accept connection" msgstr "無法允許連線" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "問題雜湊表" @@ -1874,124 +1876,123 @@ msgstr "無法解析『%s:%s (%i)』。" msgid "Unable to connect to %s %s:" msgstr "無法聯絡到主機『%s %s』：" -#: methods/gpgv.cc:64 -#, fuzzy, c-format +#: methods/gpgv.cc:65 +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "無法解析位置 %s" +msgstr "無法存取keyring：%s" -#: methods/gpgv.cc:99 +#: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" +msgstr "錯誤：Acquire::gpgv::Options 的參數列表超長。結束執行。" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "" +msgstr "內部錯誤：簽名正確無誤，但是無法確認密鑰的指紋(key fingerprint)？！" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "至少發現一個無效的簽名。" -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "" +msgstr "無法執行“%s”來驗證簽名(您安裝了 gnupg 嗎？)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "執行 gpgv 時發生未知錯誤" -#: methods/gpgv.cc:243 -#, fuzzy +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" -msgstr "下列的【新】套件都將被安裝：" +msgstr "下列的簽名皆不合法：\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" -msgstr "" +msgstr "由於沒有公鑰，下列簽名無法進行驗證：\n" -#: methods/gzip.cc:57 +#: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "無法開啟管線給 %s 使用" -#: methods/gzip.cc:102 +#: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "從 %s 進程讀取錯誤" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "等待標頭" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "取得一個單行超過 %u 字元的標頭" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "壞的標頭" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "http 伺服器傳送一個無效的回覆標頭" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http 伺服器傳送一個無效的 Content-Length 標頭" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http 伺服器傳送一個無效的 Content-Range 標頭" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "http 伺服器有損毀的範圍支援" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "未知的資料格式" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "Select 失敗" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "連線逾時" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "寫入輸出檔時發生錯誤" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "從遠端主機讀取錯誤，關閉連線" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "從伺服器讀取發生錯誤" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "壞的標頭資料" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "連線失敗" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "內部錯誤" @@ -2064,12 +2065,12 @@ msgstr "語法錯誤 %s:%u: 不支援的指令 '%s'" msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "語法錯誤 %s:%u: 檔案後有多餘的垃圾" -#: apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... 錯誤！" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... 完成" @@ -2282,12 +2283,12 @@ msgstr "候選版本" msgid "Dependency generation" msgstr "產生套件依存關係" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "無法辨識套件『%s』(1)。" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "無法辨識套件『%s』(1)。" @@ -2333,7 +2334,7 @@ msgid "Malformed line %u in source list %s (type)" msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (類別)。" #: apt-pkg/sourcelist.cc:244 -#, fuzzy, c-format +#, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "未知的類別 %1$s 於來源檔 %3$s 第 %2$u 行" @@ -2363,13 +2364,13 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "套件『%s』需要重新安裝，但找不到軟件檔案。" -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "無法解決依存關係。可能原因是某些套件被押後。" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "無法解決問題，因為某些損毀的套件被押後。" @@ -2385,15 +2386,15 @@ msgstr "找不到『%spartial』檔案目錄。" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:823 +#: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "" +msgstr "正在下載第 %li 個文件(共 %li 個，尚需 %s)" -#: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#: apt-pkg/acquire.cc:832 +#, c-format msgid "Retrieving file %li of %li" -msgstr "讀取軟件表中" +msgstr "正在下載第%li個檔案(共有%li)" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2406,12 +2407,9 @@ 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" +msgstr "更換媒體：請把名為 '%s' 的光碟置入 '%s' 碟機,然後按 [Enter] 鍵。" #: apt-pkg/init.cc:120 #, c-format @@ -2439,16 +2437,16 @@ msgstr "無法讀取套件清單或狀況檔。" msgid "You may want to run apt-get update to correct these problems" msgstr "用『apt-get -f install』指令或許能修正這些問題。" -#: apt-pkg/policy.cc:269 +#: apt-pkg/policy.cc:270 msgid "Invalid record in the preferences file, no Package header" msgstr "喜好檔有錯誤—缺少套件前置檔。" -#: apt-pkg/policy.cc:291 +#: apt-pkg/policy.cc:292 #, c-format msgid "Did not understand pin type %s" msgstr "本軟體不支持『%s』型的版本釘子。" -#: apt-pkg/policy.cc:299 +#: apt-pkg/policy.cc:300 msgid "No priority (or zero) specified for pin" msgstr "對於釘住的檔案無優先順序" @@ -2536,35 +2534,35 @@ msgstr "無法寫入來源暫存檔。" msgid "rename failed, %s (%s -> %s)." msgstr "檔名因『%s』更換失敗 (%s → %s)。" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 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 "" +#: apt-pkg/acquire-item.cc:647 +msgid "There is no public key available for the following key IDs:\n" +msgstr "以下 key ID 沒有可用的公鑰：\n" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:760 #, 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 +#: apt-pkg/acquire-item.cc:819 #, 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 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。" -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:942 msgid "Size mismatch" msgstr "檔案大小不符合。" @@ -2618,11 +2616,16 @@ msgstr "掃描碟片中的索引檔案..\n" msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "找到 %i 個套件索引，%i 源碼索引和 %i 簽名\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:683 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "保存標誌：%s \n" + +#: apt-pkg/cdrom.cc:712 msgid "That is not a valid name, try again.\n" msgstr "這不是合法名稱，重試一下。\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:728 #, c-format msgid "" "This disc is called: \n" @@ -2631,20 +2634,21 @@ msgstr "" "這個碟片名為：\n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:732 msgid "Copying package lists..." msgstr "複製套件清單中" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:756 msgid "Writing new source list\n" msgstr "寫入新的來源列表中\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:765 msgid "Source list entries for this disc are:\n" msgstr "該碟片的來源列表項目為：\n" -#: apt-pkg/cdrom.cc:803 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:807 +#, fuzzy +msgid "Unmounting CD-ROM...\n" msgstr "卸載光碟機中..." #: apt-pkg/indexcopy.cc:261 @@ -2668,83 +2672,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 -#, fuzzy, c-format +#, c-format msgid "Preparing to completely remove %s" -msgstr "開啟組態檔 %s" +msgstr "準備完整移除 %s" #: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#, c-format msgid "Completely removed %s" -msgstr "無法移除 %s" +msgstr "已完整移除%s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "連線不預期的結束" -#: ftparchive/cachedb.cc:76 -msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " -"remove and re-create the database." -msgstr "" - -#: ftparchive/writer.cc:623 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " %s 無 override 項目\n" - -#: ftparchive/writer.cc:627 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " %s 無 override 項目\n" +#~ msgid "File date has changed %s" +#~ msgstr "檔案資料已更改 %s" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "無法開啟『%s』檔案。" +#~ msgid "Could not patch file" +#~ msgstr "無法開啟『%s』檔案。" #~ msgid "Reading file list" #~ msgstr "讀取軟件表中" -#, fuzzy #~ msgid "Could not execute " #~ msgstr "無法取得『%s』鎖。" |