diff options
130 files changed, 16657 insertions, 9513 deletions
@@ -26,7 +26,7 @@ maintainer-clean dist-clean distclean pristine sanity: veryclean # The startup target builds the necessary configure scripts. It should # be used after a CVS checkout. -CONVERTED=environment.mak include/config.h include/apti18n.h makefile +CONVERTED=environment.mak include/config.h include/apti18n.h build/doc/Doxyfile makefile include buildlib/configure.mak $(BUILDDIR)/include/config.h: buildlib/config.h.in $(BUILDDIR)/include/apti18n.h: buildlib/apti18n.h.in diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h index 6c54d3e6b..96e18bc60 100644 --- a/apt-inst/contrib/arfile.h +++ b/apt-inst/contrib/arfile.h @@ -15,9 +15,6 @@ #ifndef PKGLIB_ARFILE_H #define PKGLIB_ARFILE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/arfile.h" -#endif #include <string> #include <apt-pkg/fileutl.h> diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h index 6daf00a27..42f8ef534 100644 --- a/apt-inst/contrib/extracttar.h +++ b/apt-inst/contrib/extracttar.h @@ -14,10 +14,6 @@ #ifndef PKGLIB_EXTRACTTAR_H #define PKGLIB_EXTRACTTAR_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/extracttar.h" -#endif - #include <apt-pkg/fileutl.h> #include <apt-pkg/dirstream.h> diff --git a/apt-inst/database.h b/apt-inst/database.h index 0972d40cd..ef45bc2d6 100644 --- a/apt-inst/database.h +++ b/apt-inst/database.h @@ -21,10 +21,6 @@ #ifndef PKGLIB_DATABASE_H #define PKGLIB_DATABASE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/database.h" -#endif - #include <apt-pkg/filelist.h> #include <apt-pkg/pkgcachegen.h> diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h index d89b85268..6b9f8ffc8 100644 --- a/apt-inst/deb/debfile.h +++ b/apt-inst/deb/debfile.h @@ -23,9 +23,6 @@ #ifndef PKGLIB_DEBFILE_H #define PKGLIB_DEBFILE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debfile.h" -#endif #include <apt-pkg/arfile.h> #include <apt-pkg/database.h> diff --git a/apt-inst/deb/dpkgdb.h b/apt-inst/deb/dpkgdb.h index ddbb6d6f2..125845f96 100644 --- a/apt-inst/deb/dpkgdb.h +++ b/apt-inst/deb/dpkgdb.h @@ -19,9 +19,6 @@ #ifndef PKGLIB_DPKGDB_H #define PKGLIB_DPKGDB_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/dpkgdb.h" -#endif #include <apt-pkg/database.h> diff --git a/apt-inst/dirstream.h b/apt-inst/dirstream.h index dfb480bd4..9d1af2188 100644 --- a/apt-inst/dirstream.h +++ b/apt-inst/dirstream.h @@ -25,9 +25,6 @@ #ifndef PKGLIB_DIRSTREAM_H #define PKGLIB_DIRSTREAM_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/dirstream.h" -#endif class pkgDirStream { diff --git a/apt-inst/extract.h b/apt-inst/extract.h index a9152a26f..71222983c 100644 --- a/apt-inst/extract.h +++ b/apt-inst/extract.h @@ -17,9 +17,7 @@ #ifndef PKGLIB_EXTRACT_H #define PKGLIB_EXTRACT_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/extract.h" -#endif + #include <apt-pkg/dirstream.h> #include <apt-pkg/filelist.h> diff --git a/apt-inst/filelist.h b/apt-inst/filelist.h index 7536a2f63..86766254f 100644 --- a/apt-inst/filelist.h +++ b/apt-inst/filelist.h @@ -28,9 +28,7 @@ #ifndef PKGLIB_FILELIST_H #define PKGLIB_FILELIST_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/filelist.h" -#endif + #include <apt-pkg/mmap.h> diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 94288a132..020047c06 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -24,6 +24,8 @@ #include <apt-pkg/strutl.h> #include <apt-pkg/fileutl.h> #include <apt-pkg/md5.h> +#include <apt-pkg/sha1.h> +#include <apt-pkg/tagfile.h> #include <apti18n.h> @@ -31,6 +33,7 @@ #include <unistd.h> #include <errno.h> #include <string> +#include <sstream> #include <stdio.h> /*}}}*/ @@ -100,7 +103,8 @@ void pkgAcquire::Item::Done(string Message,unsigned long Size,string, { // We just downloaded something.. string FileName = LookupTag(Message,"Filename"); - if (Complete == false && FileName == DestFile) + // we only inform the Log class if it was actually not a local thing + if (Complete == false && !Local && FileName == DestFile) { if (Owner->Log != 0) Owner->Log->Fetched(Size,atoi(LookupTag(Message,"Resume-Point","0").c_str())); @@ -131,14 +135,433 @@ 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; @@ -567,6 +990,7 @@ void pkgAcqMetaIndex::RetrievalDone(string Message) // Move it into position Rename(DestFile,FinalFile); } + chmod(FinalFile.c_str(),0644); DestFile = FinalFile; } @@ -636,9 +1060,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); } } diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 3a0a690e1..f5272ed86 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -27,72 +27,492 @@ #include <apt-pkg/pkgrecords.h> #include <apt-pkg/indexrecords.h> -#ifdef __GNUG__ -#pragma interface "apt-pkg/acquire-item.h" -#endif -// Item to acquire +/** \addtogroup acquire + * @{ + * + * \file acquire-item.h + */ + +/** \brief Represents the process by which a pkgAcquire object should + * retrieve a file or a collection of files. + * + * By convention, Item subclasses should insert themselves into the + * acquire queue when they are created by calling QueueURI(), and + * remove themselves by calling Dequeue() when either Done() or + * Failed() is invoked. Item objects are also responsible for + * notifying the download progress indicator (accessible via + * #Owner->Log) of their status. + * + * \see pkgAcquire + */ class pkgAcquire::Item { protected: - // Some private helper methods for registering URIs + /** \brief The acquire object with which this item is associated. */ pkgAcquire *Owner; + + /** \brief Insert this item into its owner's queue. + * + * \param ItemDesc Metadata about this item (its URI and + * description). + */ inline void QueueURI(ItemDesc &Item) {Owner->Enqueue(Item);}; + + /** \brief Remove this item from its owner's queue. */ inline void Dequeue() {Owner->Dequeue(this);}; - // Safe rename function with timestamp preservation + /** \brief Rename a file without modifying its timestamp. + * + * Many item methods call this as their final action. + * + * \param From The file to be renamed. + * + * \param To The new name of #From. If #To exists it will be + * overwritten. + */ void Rename(string From,string To); public: - // State of the item - enum {StatIdle, StatFetching, StatDone, StatError, - StatAuthError, StatTransientNetworkError} 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: @@ -104,36 +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=""); }; -// Item class for translated package index files +/** \brief An acquire item that is responsible for fetching a + * translated index file. + * + * The only difference from pkgAcqIndex is that transient failures + * are suppressed: no error occurs if the translated index file is + * missing. + */ class pkgAcqIndexTrans : public pkgAcqIndex { public: virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf); + + /** \brief Create a pkgAcqIndexTrans. + * + * \param Owner The pkgAcquire object with which this item is + * associated. + * + * \param URI The URI of the index file that is to be downloaded. + * + * \param URIDesc A "URI-style" description of this index file. + * + * \param ShortDesc A brief description of this index file. + * + * \param ExpectedMD5 The expected md5sum of this index file. + * + * \param compressExt The compression-related extension with which + * this index file should be downloaded, or "" to autodetect + * (".bz2" is used if bzip2 is installed, ".gz" otherwise). + */ pkgAcqIndexTrans(pkgAcquire *Owner,string URI,string URIDesc, - string ShortDesct); + string ShortDesc); }; +/** \brief Information about an index file. */ struct IndexTarget { + /** \brief A URI from which the index file can be downloaded. */ string URI; + + /** \brief A description of the index file. */ string Description; + + /** \brief A shorter description of the index file. */ string ShortDesc; + + /** \brief The key by which this index file should be + * looked up within the meta signature file. + */ string MetaKey; }; -// Item class for index signatures +/** \brief An acquire item that downloads the detached signature + * of a meta-index (Release) file, then queues up the release + * file itself. + * + * \todo Why protected members? + * + * \sa pkgAcqMetaIndex + */ class pkgAcqMetaSig : public pkgAcquire::Item { protected: - + /** \brief The fetch request that is currently being processed. */ pkgAcquire::ItemDesc Desc; - string RealURI,MetaIndexURI,MetaIndexURIDesc,MetaIndexShortDesc; + + /** \brief The URI of the signature file. Unlike Desc.URI, this is + * never modified; it is used to determine the file that is being + * downloaded. + */ + string RealURI; + + /** \brief The URI of the meta-index file to be fetched after the signature. */ + string MetaIndexURI; + + /** \brief A "URI-style" description of the meta-index file to be + * fetched after the signature. + */ + string MetaIndexURIDesc; + + /** \brief A brief description of the meta-index file to be fetched + * after the signature. + */ + string MetaIndexShortDesc; + + /** \brief A package-system-specific parser for the meta-index file. */ indexRecords* MetaIndexParser; + + /** \brief The index files which should be looked up in the meta-index + * and then downloaded. + * + * \todo Why a list of pointers instead of a list of structs? + */ const vector<struct IndexTarget*>* IndexTargets; public: @@ -145,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: @@ -179,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, @@ -186,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); @@ -215,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: @@ -238,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 f46209d12..0fd846f54 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -10,15 +10,19 @@ ##################################################################### */ /*}}}*/ + +/** \addtogroup acquire + * @{ + * + * \file acquire-method.h + */ + #ifndef PKGLIB_ACQUIRE_METHOD_H #define PKGLIB_ACQUIRE_METHOD_H #include <apt-pkg/configuration.h> #include <apt-pkg/strutl.h> -#ifdef __GNUG__ -#pragma interface "apt-pkg/acquire-method.h" -#endif class Hashes; class pkgAcqMethod @@ -86,4 +90,6 @@ class pkgAcqMethod virtual ~pkgAcqMethod() {}; }; +/** @} */ + #endif diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h index 6e1952202..2942df69f 100644 --- a/apt-pkg/acquire-worker.h +++ b/apt-pkg/acquire-worker.h @@ -9,16 +9,38 @@ ##################################################################### */ /*}}}*/ + +/** \addtogroup acquire + * @{ + * + * \file acquire-worker.h + */ + #ifndef PKGLIB_ACQUIRE_WORKER_H #define PKGLIB_ACQUIRE_WORKER_H #include <apt-pkg/acquire.h> -#ifdef __GNUG__ -#pragma interface "apt-pkg/acquire-worker.h" -#endif -// Interfacing to the method process +/** \brief A fetch subprocess. + * + * A worker process is responsible for one stage of the fetch. This + * class encapsulates the communications protocol between the master + * process and the worker, from the master end. + * + * Each worker is intrinsically placed on two linked lists. The + * Queue list (maintained in the #NextQueue variable) is maintained + * by the pkgAcquire::Queue class; it represents the set of workers + * assigned to a particular queue. The Acquire list (maintained in + * the #NextAcquire variable) is maintained by the pkgAcquire class; + * it represents the set of active workers for a particular + * pkgAcquire object. + * + * \todo Like everything else in the Acquire system, this has way too + * many protected items. + * + * \sa pkgAcqMethod, pkgAcquire::Item, pkgAcquire + */ class pkgAcquire::Worker { friend class pkgAcquire; @@ -26,64 +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.h b/apt-pkg/acquire.h index 27bb3d363..d73a52c7a 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 @@ -38,14 +72,20 @@ using std::vector; using std::string; -#ifdef __GNUG__ -#pragma interface "apt-pkg/acquire.h" -#endif #include <sys/time.h> #include <unistd.h> class pkgAcquireStatus; + +/** \brief The core download scheduler. + * + * This class represents an ongoing download. It manages the lists + * of active and pending downloads and handles setting up and tearing + * down download-related structures. + * + * \todo Why all the protected data items and methods? + */ class pkgAcquire { public: @@ -60,97 +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}; - RunResult Run(int PulseIntervall=500000); + /** \brief Download all the items that have been Add()ed to this + * download process. + * + * This method will block until the download completes, invoking + * methods on #Log to report on the progress of the download. + * + * \param PulseInterval The method pkgAcquireStatus::Pulse will be + * invoked on #Log at intervals of PulseInterval milliseconds. + * + * \return the result of the download. + */ + RunResult Run(int PulseInterval=500000); + + /** \brief Remove all items from this download process, terminate + * all download workers, and empty all queues. + */ void Shutdown(); - // Simple iteration mechanism + /** \brief Get the first #Worker object. + * + * \return the first active worker in this download process. + */ inline Worker *WorkersBegin() {return Workers;}; + + /** \brief Advance to the next #Worker object. + * + * \return the worker immediately following I, or \b NULL if none + * exists. + */ Worker *WorkerStep(Worker *I); + + /** \brief Get the head of the list of items. */ inline ItemIterator ItemsBegin() {return Items.begin();}; + + /** \brief Get the end iterator of the list of items. */ inline ItemIterator ItemsEnd() {return Items.end();}; // Iterate over queued Item URIs class UriIterator; + /** \brief Get the head of the list of enqueued item URIs. + * + * This iterator will step over every element of every active + * queue. + */ UriIterator UriBegin(); + /** \brief Get the end iterator of the list of enqueued item URIs. */ UriIterator UriEnd(); - // Cleans out the download dir + /** Deletes each entry in the given directory that is not being + * downloaded by this object. For instance, when downloading new + * list files, calling Clean() will delete the old ones. + * + * \param Dir The directory to be cleaned out. + * + * \return \b true if the directory exists and is readable. + */ bool Clean(string Dir); - // Returns the size of the total download set + /** \return the total size in bytes of all the items included in + * this download. + */ double TotalNeeded(); + + /** \return the size in bytes of all non-local items included in + * this download. + */ double FetchNeeded(); + + /** \return the amount of data to be fetched that is already + * present on the filesystem. + */ double PartialPresent(); + /** \brief Construct a new pkgAcquire. + * + * \param Log The progress indicator associated with this + * download, or \b NULL for none. This object is not owned by the + * download process and will not be deleted when the pkgAcquire + * object is destroyed. Naturally, it should live for at least as + * long as the pkgAcquire object does. + */ pkgAcquire(pkgAcquireStatus *Log = 0); + + /** \brief Destroy this pkgAcquire object. + * + * Destroys all queue, method, and item objects associated with + * this download. + */ virtual ~pkgAcquire(); }; -// Description of an Item+URI +/** \brief Represents a single download source from which an item + * should be downloaded. + * + * An item may have several assocated ItemDescs over its lifetime. + */ struct pkgAcquire::ItemDesc { + /** \brief The URI from which to download this item. */ string URI; + /** brief A description of this item. */ string Description; + /** brief A shorter description of this item. */ string ShortDesc; + /** brief The underlying item which is to be downloaded. */ Item *Owner; }; -// List of possible items queued for download. +/** \brief A single download queue in a pkgAcquire object. + * + * \todo Why so many protected values? + */ class pkgAcquire::Queue { friend class pkgAcquire; friend class pkgAcquire::UriIterator; friend class pkgAcquire::Worker; + + /** \brief The next queue in the pkgAcquire object's list of queues. */ Queue *Next; protected: - // Queued item + /** \brief A single item placed in this queue. */ struct QItem : pkgAcquire::ItemDesc { - QItem *Next; + /** \brief The next item in the queue. */ + QItem *Next; + /** \brief The worker associated with this item, if any. */ pkgAcquire::Worker *Worker; - + + /** \brief Assign the ItemDesc portion of this QItem from + * another ItemDesc + */ void operator =(pkgAcquire::ItemDesc const &I) { URI = I.URI; @@ -160,45 +402,141 @@ class pkgAcquire::Queue }; }; - // Name of the queue + /** \brief The name of this queue. */ string Name; - // Items queued into this queue + /** \brief The head of the list of items contained in this queue. + * + * \todo why a by-hand list instead of an STL structure? + */ QItem *Items; + + /** \brief The head of the list of workers associated with this queue. + * + * \todo This is plural because support exists in Queue for + * multiple workers. However, it does not appear that there is + * any way to actually associate more than one worker with a + * queue. + * + * \todo Why not just use a std::set? + */ pkgAcquire::Worker *Workers; + + /** \brief the download scheduler with which this queue is associated. */ pkgAcquire *Owner; + + /** \brief The number of entries in this queue that are currently + * being downloaded. + */ signed long PipeDepth; + + /** \brief The maximum number of entries that this queue will + * attempt to download at once. + */ unsigned long MaxPipeDepth; public: - // Put an item into this queue + /** \brief Insert the given fetch request into this queue. */ void Enqueue(ItemDesc &Item); + + /** \brief Remove all fetch requests for the given item from this queue. + * + * \return \b true if at least one request was removed from the queue. + */ bool Dequeue(Item *Owner); - // Find a Queued item + /** \brief Locate an item in this queue. + * + * \param URI A URI to match against. + * \param Owner A pkgAcquire::Worker to match against. + * + * \return the first item in the queue whose URI is #URI and that + * is being downloaded by #Owner. + */ QItem *FindItem(string URI,pkgAcquire::Worker *Owner); + + /** Presumably this should start downloading an item? + * + * \todo Unimplemented. Implement it or remove? + */ bool ItemStart(QItem *Itm,unsigned long Size); + + /** \brief Remove the given item from this queue and set its state + * to pkgAcquire::Item::StatDone. + * + * If this is the only queue containing the item, the item is also + * removed from the main queue by calling pkgAcquire::Dequeue. + * + * \param Itm The item to remove. + * + * \return \b true if no errors are encountered. + */ bool ItemDone(QItem *Itm); + /** \brief Start the worker process associated with this queue. + * + * If a worker process is already associated with this queue, + * this is equivalent to calling Cycle(). + * + * \return \b true if the startup was successful. + */ bool Startup(); + + /** \brief Shut down the worker process associated with this queue. + * + * \param Final If \b true, then the process is stopped unconditionally. + * Otherwise, it is only stopped if it does not need cleanup + * as indicated by the pkgAcqMethod::NeedsCleanup member of + * its configuration. + * + * \return \b true. + */ bool Shutdown(bool Final); + + /** \brief Send idle items to the worker process. + * + * Fills up the pipeline by inserting idle items into the worker's queue. + */ bool Cycle(); + + /** \brief Check for items that could be enqueued. + * + * Call this after an item placed in multiple queues has gone from + * the pkgAcquire::Item::StatFetching state to the + * pkgAcquire::Item::StatIdle state, to possibly refill an empty queue. + * This is an alias for Cycle(). + * + * \todo Why both this and Cycle()? Are they expected to be + * different someday? + */ void Bump(); + /** \brief Create a new Queue. + * + * \param Name The name of the new queue. + * \param Owner The download process that owns the new queue. + */ Queue(string Name,pkgAcquire *Owner); + + /** Shut down all the worker processes associated with this queue + * and empty the queue. + */ ~Queue(); }; +/** \brief Iterates over all the URIs being fetched by a pkgAcquire object. */ class pkgAcquire::UriIterator { + /** The next queue to iterate over. */ pkgAcquire::Queue *CurQ; + /** The item that we currently point at. */ pkgAcquire::Queue::QItem *CurItem; public: - // Advance to the next item inline void operator ++() {operator ++();}; + void operator ++(int) { CurItem = CurItem->Next; @@ -209,11 +547,14 @@ class pkgAcquire::UriIterator } }; - // Accessors inline pkgAcquire::ItemDesc const *operator ->() const {return CurItem;}; inline bool operator !=(UriIterator const &rhs) const {return rhs.CurQ != CurQ || rhs.CurItem != CurItem;}; inline bool operator ==(UriIterator const &rhs) const {return rhs.CurQ == CurQ && rhs.CurItem == CurItem;}; + /** \brief Create a new UriIterator. + * + * \param Q The queue over which this UriIterator should iterate. + */ UriIterator(pkgAcquire::Queue *Q) : CurQ(Q), CurItem(0) { while (CurItem == 0 && CurQ != 0) @@ -224,61 +565,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 723c8ea3a..58498aa19 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -804,7 +804,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]; @@ -1251,8 +1251,13 @@ void pkgProblemResolver::InstallProtect() { if ((Flags[I->ID] & ToRemove) == ToRemove) Cache.MarkDelete(I); - else - Cache.MarkInstall(I, false, 0, false); + else + { + // preserver the information if the package was auto + // or manual installed + bool autoInst = (Cache[I].Flags & pkgCache::Flag::Auto); + Cache.MarkInstall(I, false, 0, !autoInst); + } } } } diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index b95218061..b72874d8e 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -30,9 +30,6 @@ #ifndef PKGLIB_ALGORITHMS_H #define PKGLIB_ALGORITHMS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/algorithms.h" -#endif #include <apt-pkg/packagemanager.h> #include <apt-pkg/depcache.h> diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h index a128c29ab..d23841e5e 100644 --- a/apt-pkg/cachefile.h +++ b/apt-pkg/cachefile.h @@ -17,9 +17,6 @@ #ifndef PKGLIB_CACHEFILE_H #define PKGLIB_CACHEFILE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/cachefile.h" -#endif #include <apt-pkg/depcache.h> diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index d5a9c7b0d..08eafca0f 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -31,9 +31,6 @@ #ifndef PKGLIB_CACHEITERATORS_H #define PKGLIB_CACHEITERATORS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/cacheiterators.h" -#endif // Package Iterator class pkgCache::PkgIterator diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index e18aaff3e..68d61c098 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -5,9 +5,6 @@ #include<string> #include<vector> -#ifdef __GNUG__ -#pragma interface "apt-pkg/cdrom.h" -#endif using namespace std; diff --git a/apt-pkg/clean.h b/apt-pkg/clean.h index 43164e250..2aee2bf54 100644 --- a/apt-pkg/clean.h +++ b/apt-pkg/clean.h @@ -10,9 +10,6 @@ #ifndef APTPKG_CLEAN_H #define APTPKG_CLEAN_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/clean.h" -#endif #include <apt-pkg/pkgcache.h> diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h index 3180a03c7..1264982a8 100644 --- a/apt-pkg/contrib/cdromutl.h +++ b/apt-pkg/contrib/cdromutl.h @@ -14,10 +14,6 @@ using std::string; -#ifdef __GNUG__ -#pragma interface "apt-pkg/cdromutl.h" -#endif - bool MountCdrom(string Path); bool UnmountCdrom(string Path); bool IdentCdrom(string CD,string &Res,unsigned int Version = 2); diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h index 8f461296f..fad6d1da9 100644 --- a/apt-pkg/contrib/cmndline.h +++ b/apt-pkg/contrib/cmndline.h @@ -44,9 +44,7 @@ #ifndef PKGLIB_CMNDLINE_H #define PKGLIB_CMNDLINE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/cmndline.h" -#endif + #include <apt-pkg/configuration.h> diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index 0d4078dab..2534692a3 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -28,9 +28,7 @@ #ifndef PKGLIB_CONFIGURATION_H #define PKGLIB_CONFIGURATION_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/configuration.h" -#endif + #include <string> #include <iostream> diff --git a/apt-pkg/contrib/crc-16.h b/apt-pkg/contrib/crc-16.h index 757104c54..f30678bac 100644 --- a/apt-pkg/contrib/crc-16.h +++ b/apt-pkg/contrib/crc-16.h @@ -10,10 +10,6 @@ #ifndef APTPKG_CRC16_H #define APTPKG_CRC16_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/crc-16.h" -#endif - #define INIT_FCS 0xffff unsigned short AddCRC16(unsigned short fcs, void const *buf, unsigned long len); diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index a5fc1a223..a3be6a575 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -40,9 +40,7 @@ #ifndef PKGLIB_ERROR_H #define PKGLIB_ERROR_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/error.h" -#endif + #ifdef __GNUG__ // Methods have a hidden this parameter that is visible to this attribute diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 041aa3309..48bd95537 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -21,9 +21,6 @@ #ifndef PKGLIB_FILEUTL_H #define PKGLIB_FILEUTL_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/fileutl.h" -#endif #include <string> diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index eefa7bf41..b09ea9f6b 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -13,9 +13,6 @@ #ifndef APTPKG_HASHES_H #define APTPKG_HASHES_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/hashes.h" -#endif #include <apt-pkg/md5.h> #include <apt-pkg/sha1.h> diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h index e280d714e..247b3fab9 100644 --- a/apt-pkg/contrib/md5.h +++ b/apt-pkg/contrib/md5.h @@ -23,9 +23,6 @@ #ifndef APTPKG_MD5_H #define APTPKG_MD5_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/md5.h" -#endif #include <string> #include <algorithm> diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index e329b167a..19cf7582d 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -25,9 +25,6 @@ #ifndef PKGLIB_MMAP_H #define PKGLIB_MMAP_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/mmap.h" -#endif #include <string> #include <apt-pkg/fileutl.h> diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc index cb272e389..e3db9a45a 100644 --- a/apt-pkg/contrib/progress.cc +++ b/apt-pkg/contrib/progress.cc @@ -115,6 +115,8 @@ bool OpProgress::CheckChange(float Interval) if ((int)LastPercent == (int)Percent) return false; + + LastPercent = Percent; if (Interval == 0) return false; @@ -126,7 +128,6 @@ bool OpProgress::CheckChange(float Interval) if (Diff < Interval) return false; LastTime = Now; - LastPercent = Percent; return true; } /*}}}*/ diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h index 20caf4cdf..7dd004f7e 100644 --- a/apt-pkg/contrib/progress.h +++ b/apt-pkg/contrib/progress.h @@ -21,9 +21,6 @@ #ifndef PKGLIB_PROGRESS_H #define PKGLIB_PROGRESS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/progress.h" -#endif #include <string> #include <sys/time.h> diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h index db8ca7893..010ef802e 100644 --- a/apt-pkg/contrib/sha1.h +++ b/apt-pkg/contrib/sha1.h @@ -14,10 +14,6 @@ #ifndef APTPKG_SHA1_H #define APTPKG_SHA1_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/sha1.h" -#endif - #include <string> #include <algorithm> 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 9e88f5ece..c490bfa4d 100644 --- a/apt-pkg/contrib/sha256.h +++ b/apt-pkg/contrib/sha256.h @@ -14,13 +14,8 @@ #ifndef APTPKG_SHA256_H #define APTPKG_SHA256_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/sha256.h" -#endif - #include <string> #include <algorithm> -#include <stdint.h> using std::string; using std::min; diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 254087267..ae1244ecd 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -16,9 +16,7 @@ #ifndef STRUTL_H #define STRUTL_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/strutl.h" -#endif + #include <stdlib.h> #include <string> diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 38ecdd16a..9f435bba5 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -305,7 +305,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; diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h index 57005222f..b0012c96b 100644 --- a/apt-pkg/deb/debindexfile.h +++ b/apt-pkg/deb/debindexfile.h @@ -16,9 +16,7 @@ #ifndef PKGLIB_DEBINDEXFILE_H #define PKGLIB_DEBINDEXFILE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debindexfile.h" -#endif + #include <apt-pkg/indexfile.h> diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h index 2b9922987..c021a1b5a 100644 --- a/apt-pkg/deb/debmetaindex.h +++ b/apt-pkg/deb/debmetaindex.h @@ -2,10 +2,6 @@ #ifndef PKGLIB_DEBMETAINDEX_H #define PKGLIB_DEBMETAINDEX_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debmetaindex.h" -#endif - #include <apt-pkg/metaindex.h> #include <apt-pkg/sourcelist.h> diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h index 24e5aab88..fdf8d762b 100644 --- a/apt-pkg/deb/debrecords.h +++ b/apt-pkg/deb/debrecords.h @@ -14,10 +14,6 @@ #ifndef PKGLIB_DEBRECORDS_H #define PKGLIB_DEBRECORDS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debrecords.h" -#endif - #include <apt-pkg/pkgrecords.h> #include <apt-pkg/indexfile.h> #include <apt-pkg/tagfile.h> diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index 7645dc564..8b1237ccd 100644 --- a/apt-pkg/deb/debsrcrecords.h +++ b/apt-pkg/deb/debsrcrecords.h @@ -11,9 +11,6 @@ #ifndef PKGLIB_DEBSRCRECORDS_H #define PKGLIB_DEBSRCRECORDS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debsrcrecords.h" -#endif #include <apt-pkg/srcrecords.h> #include <apt-pkg/tagfile.h> diff --git a/apt-pkg/deb/debsystem.h b/apt-pkg/deb/debsystem.h index 84e57e74a..5f9995e5d 100644 --- a/apt-pkg/deb/debsystem.h +++ b/apt-pkg/deb/debsystem.h @@ -10,10 +10,6 @@ #ifndef PKGLIB_DEBSYSTEM_H #define PKGLIB_DEBSYSTEM_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debsystem.h" -#endif - #include <apt-pkg/pkgsystem.h> class debStatusIndex; diff --git a/apt-pkg/deb/debversion.h b/apt-pkg/deb/debversion.h index 00a8832a8..56fb67887 100644 --- a/apt-pkg/deb/debversion.h +++ b/apt-pkg/deb/debversion.h @@ -12,9 +12,7 @@ #ifndef PKGLIB_DEBVERSION_H #define PKGLIB_DEBVERSION_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/debversion.h" -#endif + #include <apt-pkg/version.h> diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 0b181dc43..7da729904 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -10,10 +10,6 @@ #ifndef PKGLIB_DPKGPM_H #define PKGLIB_DPKGPM_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/dpkgpm.h" -#endif - #include <apt-pkg/packagemanager.h> #include <vector> #include <stdio.h> diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 4d193dc2e..1e4771dda 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -8,9 +8,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/depcache.h" -#endif #include <apt-pkg/depcache.h> #include <apt-pkg/version.h> #include <apt-pkg/error.h> @@ -712,9 +709,17 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser) // We dont even try to keep virtual packages.. if (Pkg->VersionList == 0) return; - +#if 0 // reseting the autoflag here means we lose the + // auto-mark information if a user selects a package for removal + // but changes his mind then and sets it for keep again + // - this makes sense as default when all Garbage dependencies + // are automatically marked for removal (as aptitude does). + // setting a package for keep then makes it no longer autoinstalled + // for all other use-case this action is rather suprising if(FromUser && !P.Marked) P.Flags &= ~Flag::Auto; +#endif + RemoveSizes(Pkg); RemoveStates(Pkg); @@ -873,6 +878,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, bool found=false; VerIterator instVer = Pkg.CurrentVer(); if(!instVer.end()) + { for (DepIterator D = instVer.DependsList(); D.end() != true; D++) { //FIXME: deal better with or-groups(?) @@ -881,9 +887,10 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, if(IsImportantDep(D) && Start.TargetPkg() == D.TargetPkg()) found=true; } - // this is a new dep if it was not found to be already - // a important dep of the installed pacakge - isNewImportantDep = !found; + // this is a new dep if it was not found to be already + // a important dep of the installed pacakge + isNewImportantDep = !found; + } } if(isNewImportantDep) if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true) @@ -1108,6 +1115,34 @@ pkgCache::VerIterator pkgDepCache::Policy::GetCandidateVer(PkgIterator Pkg) return Last; } /*}}}*/ +// Policy::IsImportantDep - True if the dependency is important /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep) +{ + 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() @@ -1311,8 +1346,7 @@ bool pkgDepCache::Sweep() StateCache &state=PkgState[p->ID]; // if it is not marked and it is installed, it's garbage - if(!state.Marked && (!p.CurrentVer().end() || state.Install()) && - !state.Delete()) + if(!state.Marked && (!p.CurrentVer().end() || state.Install())) { state.Garbage=true; if(_config->FindB("Debug::pkgAutoRemove",false)) @@ -1322,19 +1356,3 @@ bool pkgDepCache::Sweep() return true; } - -// Policy::IsImportantDep - True if the dependency is important /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep) -{ - if(Dep.IsCritical()) - return true; - else if(Dep->Type == pkgCache::Dep::Recommends) - return _config->FindB("APT::Install-Recommends", false); - else if(Dep->Type == pkgCache::Dep::Suggests) - return _config->FindB("APT::Install-Suggests", false); - - return false; -} - /*}}}*/ diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 5cd5ea354..b2bcfb58a 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -38,9 +38,6 @@ #ifndef PKGLIB_DEPCACHE_H #define PKGLIB_DEPCACHE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/depcache.h" -#endif #include <apt-pkg/pkgcache.h> #include <apt-pkg/progress.h> diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h index d5d1cf57a..3cc501629 100644 --- a/apt-pkg/indexfile.h +++ b/apt-pkg/indexfile.h @@ -22,9 +22,6 @@ #ifndef PKGLIB_INDEXFILE_H #define PKGLIB_INDEXFILE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/indexfile.h" -#endif #include <string> #include <apt-pkg/pkgcache.h> diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h index 414faceaa..ac0df470c 100644 --- a/apt-pkg/indexrecords.h +++ b/apt-pkg/indexrecords.h @@ -5,9 +5,7 @@ #ifndef PKGLIB_INDEXRECORDS_H #define PKGLIB_INDEXRECORDS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/indexrecords.h" -#endif + #include <apt-pkg/pkgcache.h> #include <apt-pkg/fileutl.h> diff --git a/apt-pkg/init.h b/apt-pkg/init.h index b036b8609..a2da80c34 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 51 +#define APT_PKG_MAJOR 4 +#define APT_PKG_MINOR 3 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 6cc1414b2..fc9e32cfb 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.51 +MAJOR=4.3 MINOR=0 SLIBS=$(PTHREADLIB) $(INTLLIBS) APT_DOMAIN:=libapt-pkg$(MAJOR) diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h index 8ebf23541..2b87d7da9 100644 --- a/apt-pkg/metaindex.h +++ b/apt-pkg/metaindex.h @@ -1,9 +1,6 @@ #ifndef PKGLIB_METAINDEX_H #define PKGLIB_METAINDEX_H -/* #ifdef __GNUG__ */ -/* #pragma interface "apt-pkg/metaindex.h" */ -/* #endif */ #include <string> #include <apt-pkg/pkgcache.h> diff --git a/apt-pkg/orderlist.h b/apt-pkg/orderlist.h index d13301bcf..bbceb3879 100644 --- a/apt-pkg/orderlist.h +++ b/apt-pkg/orderlist.h @@ -16,9 +16,6 @@ #ifndef PKGLIB_ORDERLIST_H #define PKGLIB_ORDERLIST_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/orderlist.h" -#endif #include <apt-pkg/pkgcache.h> diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index 48f53576c..53600fb61 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -23,9 +23,6 @@ #ifndef PKGLIB_PACKAGEMANAGER_H #define PKGLIB_PACKAGEMANAGER_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/packagemanager.h" -#endif #include <string> #include <iostream> diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 93ad56641..7e3b9d78c 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -20,11 +20,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-pkg/pkgcache.h" -#pragma implementation "apt-pkg/cacheiterators.h" -#endif - #include <apt-pkg/pkgcache.h> #include <apt-pkg/indexfile.h> #include <apt-pkg/version.h> diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 970759492..83b7548a3 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -19,9 +19,6 @@ #ifndef PKGLIB_PKGCACHE_H #define PKGLIB_PKGCACHE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/pkgcache.h" -#endif #include <string> #include <time.h> diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index fae1a60a6..a47b097b3 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -19,9 +19,6 @@ #ifndef PKGLIB_PKGCACHEGEN_H #define PKGLIB_PKGCACHEGEN_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/pkgcachegen.h" -#endif #include <apt-pkg/pkgcache.h> #include <apt-pkg/md5.h> diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h index 31c444dbf..21aa66322 100644 --- a/apt-pkg/pkgrecords.h +++ b/apt-pkg/pkgrecords.h @@ -17,9 +17,6 @@ #ifndef PKGLIB_PKGRECORDS_H #define PKGLIB_PKGRECORDS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/pkgrecords.h" -#endif #include <apt-pkg/pkgcache.h> #include <apt-pkg/fileutl.h> diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h index a7d555140..246762e0b 100644 --- a/apt-pkg/pkgsystem.h +++ b/apt-pkg/pkgsystem.h @@ -37,9 +37,6 @@ #ifndef PKGLIB_PKGSYSTEM_H #define PKGLIB_PKGSYSTEM_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/pkgsystem.h" -#endif #include <apt-pkg/depcache.h> #include <vector> diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h index 40ebd3f70..d5f3b2f75 100644 --- a/apt-pkg/policy.h +++ b/apt-pkg/policy.h @@ -33,9 +33,6 @@ #ifndef PKGLIB_POLICY_H #define PKGLIB_POLICY_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/policy.h" -#endif #include <apt-pkg/depcache.h> #include <apt-pkg/versionmatch.h> diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index 123ae6984..b9e4389ed 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -35,9 +35,6 @@ using std::string; using std::vector; -#ifdef __GNUG__ -#pragma interface "apt-pkg/sourcelist.h" -#endif class pkgAquire; class pkgSourceList diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h index 3e2112549..99cbc6060 100644 --- a/apt-pkg/srcrecords.h +++ b/apt-pkg/srcrecords.h @@ -13,9 +13,6 @@ #ifndef PKGLIB_SRCRECORDS_H #define PKGLIB_SRCRECORDS_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/srcrecords.h" -#endif #include <string> #include <vector> diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index 70381ad13..05c6aa701 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -20,9 +20,6 @@ #ifndef PKGLIB_TAGFILE_H #define PKGLIB_TAGFILE_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/tagfile.h" -#endif #include <apt-pkg/fileutl.h> #include <stdio.h> diff --git a/apt-pkg/vendor.h b/apt-pkg/vendor.h index 033bb96e8..2d39fd15f 100644 --- a/apt-pkg/vendor.h +++ b/apt-pkg/vendor.h @@ -4,9 +4,6 @@ #include <vector> #include <map> -#ifdef __GNUG__ -#pragma interface "apt-pkg/vendor.h" -#endif using std::string; 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/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h index 7f96fc766..ff2f4ed5d 100644 --- a/apt-pkg/vendorlist.h +++ b/apt-pkg/vendorlist.h @@ -21,9 +21,6 @@ using std::string; using std::vector; -#ifdef __GNUG__ -#pragma interface "apt-pkg/vendorlist.h" -#endif class pkgVendorList { diff --git a/apt-pkg/version.h b/apt-pkg/version.h index 071dba3e2..49c53a93a 100644 --- a/apt-pkg/version.h +++ b/apt-pkg/version.h @@ -20,9 +20,6 @@ #ifndef PKGLIB_VERSION_H #define PKGLIB_VERSION_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/version.h" -#endif #include <apt-pkg/strutl.h> #include <string> diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h index 7ca39cbe8..fe264aa46 100644 --- a/apt-pkg/versionmatch.h +++ b/apt-pkg/versionmatch.h @@ -31,9 +31,6 @@ #ifndef PKGLIB_VERSIONMATCH_H #define PKGLIB_VERSIONMATCH_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/versionmatch.h" -#endif #include <string> #include <apt-pkg/pkgcache.h> 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/cmdline/apt-get.cc b/cmdline/apt-get.cc index 4bd66383f..b47c2ec09 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -650,7 +650,7 @@ bool CacheFile::CheckDeps(bool AllowBroken) // upgrade all policy-broken packages with ForceImportantDeps=True for (pkgCache::PkgIterator I = Cache->PkgBegin(); !I.end(); I++) if ((*DCache)[I].NowPolicyBroken() == true) - DCache->MarkInstall(I,true,0,false, true); + DCache->MarkInstall(I,true,0, false, true); } } @@ -1419,31 +1419,47 @@ bool DoUpdate(CommandLine &CmdL) /* Remove unused automatic packages */ bool DoAutomaticRemove(CacheFile &Cache) { - if(_config->FindI("Debug::pkgAutoRemove",false)) - std::cout << "DoAutomaticRemove()" << std::endl; + bool Debug = _config->FindI("Debug::pkgAutoRemove",false); + bool doAutoRemove = _config->FindB("APT::Get::AutomaticRemove", false); + pkgDepCache::ActionGroup group(*Cache); + - if (_config->FindB("APT::Get::Remove",true) == false) - return _error->Error(_("We are not supposed to delete stuff, can't " - "start AutoRemover")); + if(Debug) + std::cout << "DoAutomaticRemove()" << std::endl; + if (_config->FindB("APT::Get::Remove",true) == false && + doAutoRemove == true) { - pkgDepCache::ActionGroup group(*Cache); - - // look over the cache to see what can be removed - for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg) - { - if (Cache[Pkg].Garbage) - { - if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install()) - fprintf(stdout,"We could delete %s\n", Pkg.Name()); + c1out << _("We are not supposed to delete stuff, can't start " + "AutoRemover") << std::endl; + doAutoRemove = false; + } - if(Pkg.CurrentVer() != 0 && Pkg->CurrentState != pkgCache::State::ConfigFiles) + 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; + + autoremovelist += string(Pkg.Name()) + " "; + autoremoveversions += string(Cache[Pkg].CandVersion) + " "; + if (doAutoRemove) + { + if(Pkg.CurrentVer() != 0 && + Pkg->CurrentState != pkgCache::State::ConfigFiles) Cache->MarkDelete(Pkg, _config->FindB("APT::Get::Purge", false)); - else + else Cache->MarkKeep(Pkg, false, false); - } - } + } + } } + ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions); + if (!doAutoRemove && autoremovelist.size() > 0) + c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl; // Now see if we destroyed anything if (Cache->BrokenCount() != 0) @@ -1480,6 +1496,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 */ diff --git a/cmdline/apt-key b/cmdline/apt-key index be2b19a1a..7460a24be 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -9,14 +9,14 @@ GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg" -ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg -REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg +ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg +REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg update() { if [ ! -f $ARCHIVE_KEYRING ]; then echo >&2 "ERROR: Can't find the archive-keyring" - echo >&2 "Is the ubuntu-keyring package installed?" + echo >&2 "Is the debian-archive-keyring package installed?" exit 1 fi 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 81f327c37..b72421968 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.46.3") +AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) @@ -175,12 +175,21 @@ dnl Check for debiandoc AC_PATH_PROG(DEBIANDOC_HTML,debiandoc2html) AC_PATH_PROG(DEBIANDOC_TEXT,debiandoc2text) +dnl Check for doxygen +AC_PATH_PROG(DOXYGEN, doxygen) + dnl Check for the SGML tools needed to build man pages AC_PATH_PROG(DOCBOOK2MAN,docbook2man) dnl Check for the XML tools needed to build man pages AC_PATH_PROG(XMLTO,xmlto) +dnl Check for graphviz +AC_CHECK_PROG([HAVE_DOT], [dot], [YES], [NO]) +AC_PATH_PROG([DOT], [dot], []) +DOTDIR=$(dirname $DOT) +AC_SUBST(DOTDIR) + dnl Check for YODL dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","") @@ -200,4 +209,4 @@ fi AC_SUBST(USE_NLS) AC_PATH_PROG(BASH, bash) -AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make -s dirs) +AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile,make -s dirs) diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian index db04b1e91..f44d1966b 100644 --- a/debian/NEWS.Debian +++ b/debian/NEWS.Debian @@ -1,3 +1,11 @@ +apt (0.6.44) unstable; urgency=low + + * apt-ftparchive --db now uses Berkeley DB_BTREE instead of DB_HASH. + If you use a database created by an older version of apt, delete + it and allow it to be recreated the next time. + + -- Michael Vogt <mvo@debian.org> Wed, 26 Apr 2006 12:57:53 +0200 + apt (0.5.25) unstable; urgency=low * apt-ftparchive --db now uses Berkeley DB version 4.2. If used with a diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove new file mode 100644 index 000000000..98143ce9a --- /dev/null +++ b/debian/apt.conf.autoremove @@ -0,0 +1,8 @@ +APT +{ + NeverAutoRemove + { + "^linux-image.*"; + "^linux-restricted-modules.*"; + }; +}; diff --git a/debian/apt.dirs b/debian/apt.dirs index e1cb738fa..1543e8bb1 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -2,6 +2,7 @@ usr/bin usr/lib/apt/methods usr/lib/dpkg/methods/apt etc/apt +etc/apt/apt.conf.d etc/apt/sources.list.d var/cache/apt/archives/partial var/lib/apt/lists/partial diff --git a/debian/apt.postinst b/debian/apt.postinst index df0433057..88fb932df 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -17,9 +17,11 @@ case "$1" in configure) if ! test -f /etc/apt/trusted.gpg; then - cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg + cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg fi + apt-key update + ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/changelog b/debian/changelog index 254e603aa..52bdced8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,31 @@ -apt (0.6.46.4) unstable; urgency=low +apt (0.7.0) experimental; urgency=low + * Branch 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 + * Removed all #pragma interface/implementation + * 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) + + + -- Michael Vogt <mvo@debian.org> Thu, 14 Dec 2006 11:31:41 +0100 + +apt (0.6.46.5) UNRELEASED; urgency=low + + * apt-pkg/algorithm.cc: + - use clog for all debugging + + -- Michael Vogt <mvo@debian.org> Thu, 14 Dec 2006 11:31:41 +0100 + +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 @@ -10,8 +36,30 @@ apt (0.6.46.4) unstable; urgency=low - 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 @@ -20,44 +68,55 @@ apt (0.6.46.3) unstable; urgency=low 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 + - 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. - (closes: bug#359634) * rebuild against current g++ because of: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29289 - (closes: #390189) * fix broken i18n in the dpkg progress reporting, thanks to Frans Pop and Steinar Gunderson. (closes: #389261) * Merged from Christian Perrier bzr branch: @@ -110,7 +169,7 @@ apt (0.6.45) unstable; urgency=low * apt-pkg/contrib/sha256.cc: - fixed the sha256 generation (closes: #378183) * ftparchive/cachedb.cc: - - applied patch from Anthony Towns to fix Clean() function + - applied patch from ajt to fix Clean() function (closes: #379576) * doc/apt-get.8.xml: - fix path to the apt user build (Closes: #375640) @@ -128,9 +187,6 @@ apt (0.6.45) unstable; urgency=low - fix for string mangling, closes: #373864 * apt-pkg/acquire-item.cc: - check for bzip2 in /bin (closes: #377391) - * apt-pkg/tagfile.cc: - - make it work on non-mapable files again, thanks - to James Troup for confirming the fix (closes: #376777) * Merged from Christian Perrier bzr branch: * ko.po: Updated to 512t. Closes: #378901 * hu.po: Updated to 512t. Closes: #376330 @@ -141,57 +197,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 - -apt (0.6.44.2ubuntu4) edgy; urgency=low - - * Make apt-get dselect-upgrade happy again - - -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 21 Jul 2006 11:03:02 +0200 - -apt (0.6.44.2ubuntu3) edgy; urgency=low - - * Close extended_states file after writing it. - - -- Colin Watson <cjwatson@ubuntu.com> Tue, 18 Jul 2006 00:12:13 +0100 - -apt (0.6.44.2ubuntu2) edgy; urgency=low + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 25 Jul 2006 11:55:22 +0200 - * create a empty extended_states file if none exists already +apt (0.6.44.2exp1) experimental; urgency=low - -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 4 Jul 2006 09:23:03 +0200 + * 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 -apt (0.6.44.2ubuntu1) edgy; urgency=low + -- Michael Vogt <mvo@debian.org> Mon, 3 Jul 2006 21:50:31 +0200 - * merged with debian/unstable - * merged the "auto-mark" branch to support aptitude like - marking of automatically installed dependencies and added - "apt-get remove --auto-remove" to remove unused auto-installed - packages again - * changed library version from 3.11 to 3.50 to make it clearly - different from the debian version (we are ABI incompatible because - of the auto-mark patch) +apt (0.6.44.2) unstable; urgency=low - -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 3 Jul 2006 18:30:46 +0200 + * 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 -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 + -- Michael Vogt <mvo@debian.org> Wed, 14 Jun 2006 12:00:57 +0200 apt (0.6.44.1-0.1) unstable; urgency=low @@ -203,22 +244,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 @@ -243,26 +294,6 @@ apt (0.6.44) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 8 May 2006 22:28:53 +0200 -apt (0.6.43.3ubuntu3) dapper; urgency=low - - * methods/http.cc: - - fix the user-agent string - - -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 26 May 2006 18:09:32 +0200 - -apt (0.6.43.3ubuntu2) dapper; urgency=low - - * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman) - - -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 18 Apr 2006 13:24:40 +0200 - -apt (0.6.43.3ubuntu1) dapper; urgency=low - - * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large in - the status-fd (ubuntu #28954) - - -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Mar 2006 20:34:46 +0200 - apt (0.6.43.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186: @@ -272,46 +303,16 @@ apt (0.6.43.3) unstable; urgency=low * pl.po: Completed to 512t. Closes: #349514 * sk.po: Completed to 512t. Closes: #349474 * gl.po: Completed to 512 strings Closes: #349407 - * vi.po: Completed to 512 strings * sv.po: Completed to 512 strings Closes: #349210 * ru.po: Completed to 512 strings Closes: #349154 * da.po: Completed to 512 strings Closes: #349084 * fr.po: Completed to 512 strings - * LINGUAS: Add Welsh - * *.po: Updated from sources (512 strings) * vi.po: Completed to 511 strings Closes: #348968 - * apt-pkg/deb/deblistparser.cc: - - don't explode on a DepCompareOp in a Provides line, but warn about - it and ignore it otherwise (thanks to James Troup for reporting it) - * cmdline/apt-get.cc: - - don't lock the lists directory in DoInstall, breaks --print-uri - (thanks to James Troup for reporting it) - * debian/apt.dirs: create /etc/apt/sources.list.d - * make apt-cache madison work without deb-src entries (#352583) - * cmdline/apt-get.cc: only run the list-cleaner if a update was - successfull - * apt-get update errors are only warnings nowdays - * be more careful with the signature file on network failures - - -- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100 - -apt (0.6.43.2ubuntu1) dapper; urgency=low - - * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182: - * ca.po: Completed to 512t. Closes: #351592 - * eu.po: Completed to 512t. Closes: #350483 - * ja.po: Completed to 512t. Closes: #349806 - * pl.po: Completed to 512t. Closes: #349514 - * sk.po: Completed to 512t. Closes: #349474 - * gl.po: Completed to 512 strings Closes: #349407 - * vi.po: Completed to 512 strings - * sv.po: Completed to 512 strings Closes: #349210 - * ru.po: Completed to 512 strings Closes: #349154 - * da.po: Completed to 512 strings Closes: #349084 - * fr.po: Completed to 512 strings + * zh_CN.po: Completed to 512t. Closes: #353936 + * it.po: Completed to 512t. Closes: #352803 + * pt_BR.po: Completed to 512t. Closes: #352419 * LINGUAS: Add Welsh * *.po: Updated from sources (512 strings) - * vi.po: Completed to 511 strings Closes: #348968 * apt-pkg/deb/deblistparser.cc: - don't explode on a DepCompareOp in a Provides line, but warn about it and ignore it otherwise (thanks to James Troup for reporting it) @@ -322,10 +323,8 @@ apt (0.6.43.2ubuntu1) dapper; urgency=low * make apt-cache madison work without deb-src entries (#352583) * cmdline/apt-get.cc: only run the list-cleaner if a update was successfull - * apt-get update errors are only warnings nowdays - * be more careful with the signature file on network failures - -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 20 Feb 2006 22:27:48 +0100 + -- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100 apt (0.6.43.2) unstable; urgency=low @@ -350,26 +349,8 @@ apt (0.6.43.2) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Thu, 19 Jan 2006 00:06:33 +0100 -apt (0.6.43.1ubuntu1) dapper; urgency=low - - * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159: - - en_GB.po, de.po: fix spaces errors in "Ign " translations - Closes: #347258 - - makefile: make update-po a pre-requisite of clean target so - that POT and PO files are always up-to-date - - sv.po: Completed to 511t. Closes: #346450 - - sk.po: Completed to 511t. Closes: #346369 - - fr.po: Completed to 511t - - *.po: Updated from sources (511 strings) - * add patch to fix http download corruption problem (thanks to - Petr Vandrovec, closes: #280844, #290694) - * added APT::Periodic::Unattended-Upgrade (requires the package - "unattended-upgrade") - - -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 10 Jan 2006 17:09:31 +0100 - apt (0.6.43.1) unstable; urgency=low - + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148: * fr.po: Completed to 510 strings * it.po: Completed to 510t @@ -391,19 +372,6 @@ apt (0.6.43.1) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 6 Jan 2006 01:17:08 +0100 -apt (0.6.43ubuntu2) dapper; urgency=low - - * merged some missing bits that wheren't merged by baz in the previous - upload (*grumble*) - - -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 8 Dec 2005 18:35:58 +0100 - -apt (0.6.43ubuntu1) dapper; urgency=low - - * merged with debian - - -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Nov 2005 11:36:29 +0100 - apt (0.6.43) unstable; urgency=medium * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132: @@ -424,22 +392,6 @@ apt (0.6.43) unstable; urgency=medium -- Michael Vogt <mvo@debian.org> Tue, 29 Nov 2005 00:17:07 +0100 -apt (0.6.42.3ubuntu2) dapper; urgency=low - - * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131: - * zh_CN.po: Completed to 507 strings(Closes: #338267) - * gl.po: Completed to 510 strings (Closes: #338356) - * added support for "/etc/apt/sources.list.d" directory - (closes: #66325) - - -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Nov 2005 15:30:12 +0100 - -apt (0.6.42.3ubuntu1) dapper; urgency=low - - * synced with debian - - -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Nov 2005 05:05:56 +0100 - apt (0.6.42.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129: @@ -487,13 +439,13 @@ apt (0.6.42) unstable; urgency=low - unmount the cdrom when apt failed to locate any package files * allow cdrom failures and fallback to other sources in that case (closes: #44135) - * better error text when dpkg-source fails + * better error text when dpkg-source fails * Merge bubulle@debian.org--2005/apt--main--0 up to patch-115: - patch-99: Added Galician translation - patch-100: Completed Danish translation (Closes: #325686) - patch-104: French translation completed - patch-109: Italian translation completed - - patch-112: Swedish translation update + - patch-112: Swedish translation update - patch-115: Basque translation completed (Closes: #333299) * applied french man-page update (thanks to Philippe Batailler) (closes: #316638, #327456) @@ -507,9 +459,9 @@ apt (0.6.42) unstable; urgency=low * apt-pkg/contrib/md5.cc: - fix a alignment problem on sparc64 that gives random bus errors (thanks to Fabbione for providing a test-case) - * init the default ScreenWidth to 79 columns by default + * init the default ScreenWidth to 79 columns by default (Closes: #324921) - * cmdline/apt-cdrom.cc: + * cmdline/apt-cdrom.cc: - fix some missing gettext() calls (closes: #334539) * doc/apt-cache.8.xml: fix typo (closes: #334714) @@ -520,8 +472,8 @@ apt (0.6.41) unstable; urgency=low * improved the support for "error" and "conffile" reporting from dpkg, added the format to README.progress-reporting * added README.progress-reporting to the apt-doc package - * improved the network timeout handling, if a index file from a - sources.list times out or EAI_AGAIN is returned from getaddrinfo, + * improved the network timeout handling, if a index file from a + sources.list times out or EAI_AGAIN is returned from getaddrinfo, don't try to get the other files from that entry * Support architecture-specific extra overrides (closes: #225947). Thanks to Anthony Towns for idea and @@ -529,10 +481,10 @@ apt (0.6.41) unstable; urgency=low * Javier Fernandez-Sanguino Pen~a: - Added a first version of an apt-secure.8 manpage, and modified apt-key and apt.end accordingly. Also added the 'update' - argument to apt-key which was previously not documented + argument to apt-key which was previously not documented (Closes: #322120) * Andreas Pakulat: - - added example apt-ftparchive.conf file to doc/examples + - added example apt-ftparchive.conf file to doc/examples (closes: #322483) * Fix a incorrect example in the man-page (closes: #282918) * Fix a bug for very long lines in the apt-cdrom code (closes: #280356) @@ -541,84 +493,10 @@ apt (0.6.41) unstable; urgency=low * Change pkgPolicy::Pin from private to protected to let subclasses access it too (closes: #321799) * add default constructor for PrvIterator (closes: #322267) - * Reread status configuration on debSystem::Initialize() + * Reread status configuration on debSystem::Initialize() (needed for apt-proxy, thanks to Otavio for this patch) - - -- Michael Vogt <mvo@debian.org> Mon, 5 Sep 2005 22:59:03 +0200 -apt (0.6.40.1ubuntu8) breezy; urgency=low - - * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62: - - fix for a bad memory/file leak in the mmap code (ubuntu #15603) - * po/de.po, po/fr.po: - - updated the translations - * po/makefile: - - create a single pot file in each domain dir to make rosetta happy - - -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 28 Sep 2005 10:16:06 +0200 - -apt (0.6.40.1ubuntu7) breezy; urgency=low - - * updated the pot/po files , no code changes - - -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 27 Sep 2005 18:38:16 +0200 - -apt (0.6.40.1ubuntu6) breezy; urgency=low - - * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56: - - make it possible for apt to handle a failed MediaChange event and - fall back to other sources (ubuntu #13713) - - -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2005 22:09:50 +0200 - -apt (0.6.40.1ubuntu5) breezy; urgency=low - - * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}. - This adds media-change reporting to the apt status-fd (ubuntu #15213) - * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55: - apt-pkg/cdrom.cc: - - unmount the cdrom when apt failed to locate any package files - - -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 12 Sep 2005 15:44:26 +0200 - -apt (0.6.40.1ubuntu4) breezy; urgency=low - - * debian/apt.cron.daily: - - fix a embarrassing typo - - -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 7 Sep 2005 10:10:37 +0200 - -apt (0.6.40.1ubuntu3) breezy; urgency=low - - * debian/apt.cron.daily: - - use the ctime as well when figuring what packages need to - be removed. This fixes the problem that packages copied with - "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504) - - -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Sep 2005 18:30:46 +0200 - -apt (0.6.40.1ubuntu2) breezy; urgency=low - - * improved the support for "error" and "conffile" reporting from - dpkg, added the format to README.progress-reporting - * added README.progress-reporting to the apt-doc package - * Do md5sum checking for file and cdrom method (closes: #319142) - * Change pkgPolicy::Pin from private to protected to let subclasses - access it too (closes: #321799) - * methods/connect.cc: - - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item - * apt-pkg/acquire-item.cc: - - fail early if a FailReason is TmpResolveFailure (avoids hangs during - the install when no network is available) - * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0 - - -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 23 Aug 2005 19:44:55 +0200 - -apt (0.6.40.1ubuntu1) breezy; urgency=low - - * Synchronize with Debian - - -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 5 Aug 2005 14:20:56 +0200 + -- Michael Vogt <mvo@debian.org> Mon, 5 Sep 2005 22:59:03 +0200 apt (0.6.40.1) unstable; urgency=low @@ -629,12 +507,6 @@ apt (0.6.40.1) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 5 Aug 2005 13:24:58 +0200 -apt (0.6.40ubuntu1) breezy; urgency=low - - * Synchronize with Debian - - -- Matt Zimmerman <mdz@ubuntu.com> Thu, 4 Aug 2005 15:53:22 -0700 - apt (0.6.40) unstable; urgency=low * Patch from Jordi Mallach to mark some additional strings for translation @@ -650,39 +522,6 @@ apt (0.6.40) unstable; urgency=low -- Matt Zimmerman <mdz@debian.org> Thu, 28 Jul 2005 11:57:32 -0700 -apt (0.6.39ubuntu4) breezy; urgency=low - - * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this - before...) - - -- Matt Zimmerman <mdz@ubuntu.com> Wed, 29 Jun 2005 08:39:17 -0700 - -apt (0.6.39ubuntu3) breezy; urgency=low - - * Fix keyring locations for Ubuntu in apt-key too. - - -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 14:45:36 +0100 - -apt (0.6.39ubuntu2) breezy; urgency=low - - * Install ubuntu-archive.gpg rather than debian-archive.gpg as - /etc/apt/trusted.gpg. - - -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 11:53:34 +0100 - -apt (0.6.39ubuntu1) breezy; urgency=low - - * Michael Vogt - - Change debian/bugscript to use #!/bin/bash (Closes: #313402) - - Fix a incorrect example in the man-page (closes: #282918) - - Support architecture-specific extra overrides - (closes: #225947). Thanks to Anthony Towns for idea and - the patch, thanks to Colin Watson for testing it. - - better report network timeouts from the methods to the acuire code, - only timeout once per sources.list line - - -- Matt Zimmerman <mdz@ubuntu.com> Tue, 28 Jun 2005 11:52:24 -0700 - apt (0.6.39) unstable; urgency=low * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6 @@ -693,14 +532,7 @@ apt (0.6.39) unstable; urgency=low * Update priority of apt-utils to important, to match the override file * Install only one keyring on each branch (Closes: #316119) - -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:35:21 -0700 - -apt (0.6.38ubuntu1) breezy; urgency=low - - * First release from Ubuntu branch - * Merge with --main--0, switch back to Ubuntu keyring - - -- Matt Zimmerman <mdz@ubuntu.com> Sat, 25 Jun 2005 16:52:41 -0700 + -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:51:09 -0700 apt (0.6.38) unstable; urgency=low diff --git a/debian/control b/debian/control index dfcebf41e..f331a84c1 100644 --- a/debian/control +++ b/debian/control @@ -9,12 +9,11 @@ Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) 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: ubuntu-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. diff --git a/debian/rules b/debian/rules index 4e7490bed..68302daff 100755 --- a/debian/rules +++ b/debian/rules @@ -210,8 +210,8 @@ apt: build debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script - cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ - + 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 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-get.8.xml b/doc/apt-get.8.xml index 17f663a35..3c245b83b 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -47,6 +47,7 @@ <arg>check</arg> <arg>clean</arg> <arg>autoclean</arg> + <arg>autoremove</arg> </group> </cmdsynopsis> </refsynopsisdiv> @@ -203,6 +204,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 +388,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> diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 55edd77e5..55e9761a2 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -112,6 +112,8 @@ Acquire Queue-Mode "host"; // host|access Retries "0"; Source-Symlinks "true"; + + PDiffs "true"; // try to get the IndexFile diffs // HTTP method configuration http 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.h b/ftparchive/apt-ftparchive.h index c364d670e..240cf9ba7 100644 --- a/ftparchive/apt-ftparchive.h +++ b/ftparchive/apt-ftparchive.h @@ -13,9 +13,6 @@ #ifndef APT_FTPARCHIVE_H #define APT_FTPARCHIVE_H -#ifdef __GNUG__ -#pragma interface "apt-ftparchive.h" -#endif #include <fstream> diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h index afa22213a..c10f41ecc 100644 --- a/ftparchive/cachedb.h +++ b/ftparchive/cachedb.h @@ -12,9 +12,7 @@ #ifndef CACHEDB_H #define CACHEDB_H -#ifdef __GNUG__ -#pragma interface "cachedb.h" -#endif + #include <db.h> #include <string> diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h index 444d8626f..a65077e73 100644 --- a/ftparchive/multicompress.h +++ b/ftparchive/multicompress.h @@ -16,9 +16,7 @@ #ifndef MULTICOMPRESS_H #define MULTICOMPRESS_H -#ifdef __GNUG__ -#pragma interface "multicompress.h" -#endif + #include <string> #include <apt-pkg/fileutl.h> diff --git a/ftparchive/override.h b/ftparchive/override.h index e64641776..f270556eb 100644 --- a/ftparchive/override.h +++ b/ftparchive/override.h @@ -12,9 +12,7 @@ #ifndef OVERRIDE_H #define OVERRIDE_H -#ifdef __GNUG__ -#pragma interface "override.h" -#endif + #include <map> #include <string> diff --git a/ftparchive/writer.h b/ftparchive/writer.h index 1d47d57ec..a4e4356f9 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -13,9 +13,6 @@ #ifndef WRITER_H #define WRITER_H -#ifdef __GNUG__ -#pragma interface "writer.h" -#endif #include <string> #include <stdio.h> diff --git a/methods/http.cc b/methods/http.cc index 1833f41ef..1f3b038bc 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -58,7 +58,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 +713,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) Req += string("Authorization: Basic ") + Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n"; - Req += "User-Agent: Ubuntu APT-HTTP/1.3\r\n\r\n"; + Req += "User-Agent: Debian APT-HTTP/1.3\r\n\r\n"; if (Debug == true) cerr << Req << endl; diff --git a/methods/makefile b/methods/makefile index 2e3abe55c..948f27889 100644 --- a/methods/makefile +++ b/methods/makefile @@ -7,7 +7,7 @@ include ../buildlib/defaults.mak BIN := $(BIN)/methods # FIXME.. -LIB_APT_PKG_MAJOR = 3.51 +LIB_APT_PKG_MAJOR = 4.3 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method @@ -59,6 +59,13 @@ LIB_MAKES = apt-pkg/makefile SOURCE = ftp.cc rfc2553emu.cc connect.cc include $(PROGRAM_H) +# The rred method +PROGRAM=rred +SLIBS = -lapt-pkg $(SOCKETLIBS) +LIB_MAKES = apt-pkg/makefile +SOURCE = rred.cc +include $(PROGRAM_H) + # The rsh method PROGRAM=rsh SLIBS = -lapt-pkg diff --git a/methods/rred.cc b/methods/rred.cc new file mode 100644 index 000000000..6fa57f3a6 --- /dev/null +++ b/methods/rred.cc @@ -0,0 +1,262 @@ +#include <apt-pkg/fileutl.h> +#include <apt-pkg/error.h> +#include <apt-pkg/acquire-method.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/hashes.h> + +#include <sys/stat.h> +#include <unistd.h> +#include <utime.h> +#include <stdio.h> +#include <errno.h> +#include <apti18n.h> + +/* this method implements a patch functionality similar to "patch --ed" that is + * used by the "tiffany" incremental packages download stuff. it differs from + * "ed" insofar that it is way more restricted (and therefore secure). in the + * moment only the "c", "a" and "d" commands of ed are implemented (diff + * doesn't output any other). additionally the records must be reverse sorted + * by line number and may not overlap (diff *seems* to produce this kind of + * output). + * */ + +const char *Prog; + +class RredMethod : public pkgAcqMethod +{ + bool Debug; + // the size of this doesn't really matter (except for performance) + const static int BUF_SIZE = 1024; + // the ed commands + enum Mode {MODE_CHANGED, MODE_DELETED, MODE_ADDED}; + // return values + enum State {ED_OK, ED_ORDERING, ED_PARSER, ED_FAILURE}; + // this applies a single hunk, it uses a tail recursion to + // reverse the hunks in the file + int ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line, + char *buffer, unsigned int bufsize, Hashes *hash); + // apply a patch file + int ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, Hashes *hash); + // the methods main method + virtual bool Fetch(FetchItem *Itm); + + public: + + RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {}; +}; + +int RredMethod::ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line, + char *buffer, unsigned int bufsize, Hashes *hash) { + int pos; + int startline; + int stopline; + int mode; + int written; + char *idx; + + /* get the current command and parse it*/ + if (fgets(buffer, bufsize, ed_cmds) == NULL) { + return line; + } + startline = strtol(buffer, &idx, 10); + if (startline < line) { + return ED_ORDERING; + } + if (*idx == ',') { + idx++; + stopline = strtol(idx, &idx, 10); + } + else { + stopline = startline; + } + if (*idx == 'c') { + mode = MODE_CHANGED; + if (Debug == true) { + std::clog << "changing from line " << startline + << " to " << stopline << std::endl; + } + } + else if (*idx == 'a') { + mode = MODE_ADDED; + if (Debug == true) { + std::clog << "adding after line " << startline << std::endl; + } + } + else if (*idx == 'd') { + mode = MODE_DELETED; + if (Debug == true) { + std::clog << "deleting from line " << startline + << " to " << stopline << std::endl; + } + } + else { + return ED_PARSER; + } + /* get the current position */ + pos = ftell(ed_cmds); + /* if this is add or change then go to the next full stop */ + if ((mode == MODE_CHANGED) || (mode == MODE_ADDED)) { + do { + fgets(buffer, bufsize, ed_cmds); + while ((strlen(buffer) == (bufsize - 1)) + && (buffer[bufsize - 2] != '\n')) { + fgets(buffer, bufsize, ed_cmds); + buffer[0] = ' '; + } + } while (strncmp(buffer, ".", 1) != 0); + } + /* do the recursive call */ + line = ed_rec(ed_cmds, in_file, out_file, line, buffer, bufsize, + hash); + /* pass on errors */ + if (line < 0) { + return line; + } + /* apply our hunk */ + fseek(ed_cmds, pos, SEEK_SET); + /* first wind to the current position */ + if (mode != MODE_ADDED) { + startline -= 1; + } + while (line < startline) { + fgets(buffer, bufsize, in_file); + written = fwrite(buffer, 1, strlen(buffer), out_file); + hash->Add((unsigned char*)buffer, written); + while ((strlen(buffer) == (bufsize - 1)) + && (buffer[bufsize - 2] != '\n')) { + fgets(buffer, bufsize, in_file); + written = fwrite(buffer, 1, strlen(buffer), out_file); + hash->Add((unsigned char*)buffer, written); + } + line++; + } + /* include from ed script */ + if ((mode == MODE_ADDED) || (mode == MODE_CHANGED)) { + do { + fgets(buffer, bufsize, ed_cmds); + if (strncmp(buffer, ".", 1) != 0) { + written = fwrite(buffer, 1, strlen(buffer), out_file); + hash->Add((unsigned char*)buffer, written); + while ((strlen(buffer) == (bufsize - 1)) + && (buffer[bufsize - 2] != '\n')) { + fgets(buffer, bufsize, ed_cmds); + written = fwrite(buffer, 1, strlen(buffer), out_file); + hash->Add((unsigned char*)buffer, written); + } + } + else { + break; + } + } while (1); + } + /* ignore the corresponding number of lines from input */ + if ((mode == MODE_DELETED) || (mode == MODE_CHANGED)) { + while (line < stopline) { + fgets(buffer, bufsize, in_file); + while ((strlen(buffer) == (bufsize - 1)) + && (buffer[bufsize - 2] != '\n')) { + fgets(buffer, bufsize, in_file); + } + line++; + } + } + return line; +} + +int RredMethod::ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, + Hashes *hash) { + char buffer[BUF_SIZE]; + int result; + int written; + + /* we do a tail recursion to read the commands in the right order */ + result = ed_rec(ed_cmds, in_file, out_file, 0, buffer, BUF_SIZE, + hash); + + /* read the rest from infile */ + if (result > 0) { + while (fgets(buffer, BUF_SIZE, in_file) != NULL) { + written = fwrite(buffer, 1, strlen(buffer), out_file); + hash->Add((unsigned char*)buffer, written); + } + } + else { + return ED_FAILURE; + } + return ED_OK; +} + + +bool RredMethod::Fetch(FetchItem *Itm) +{ + Debug = _config->FindB("Debug::pkgAcquire::RRed",false); + URI Get = Itm->Uri; + string Path = Get.Host + Get.Path; // To account for relative paths + // Path contains the filename to patch + FetchResult Res; + Res.Filename = Itm->DestFile; + URIStart(Res); + // Res.Filename the destination filename + + if (Debug == true) + std::clog << "Patching " << Path << " with " << Path + << ".ed and putting result into " << Itm->DestFile << std::endl; + // Open the source and destination files (the d'tor of FileFd will do + // the cleanup/closing of the fds) + FileFd From(Path,FileFd::ReadOnly); + FileFd Patch(Path+".ed",FileFd::ReadOnly); + FileFd To(Itm->DestFile,FileFd::WriteEmpty); + To.EraseOnFailure(); + if (_error->PendingError() == true) + return false; + + Hashes Hash; + FILE* fFrom = fdopen(From.Fd(), "r"); + FILE* fPatch = fdopen(Patch.Fd(), "r"); + FILE* fTo = fdopen(To.Fd(), "w"); + // now do the actual patching + if (ed_file(fPatch, fFrom, fTo, &Hash) != ED_OK) { + _error->Errno("rred", _("Could not patch file")); + return false; + } + + // write out the result + fflush(fFrom); + fflush(fPatch); + fflush(fTo); + From.Close(); + Patch.Close(); + To.Close(); + + // Transfer the modification times + struct stat Buf; + if (stat(Path.c_str(),&Buf) != 0) + return _error->Errno("stat",_("Failed to stat")); + + struct utimbuf TimeBuf; + TimeBuf.actime = Buf.st_atime; + TimeBuf.modtime = Buf.st_mtime; + if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0) + return _error->Errno("utime",_("Failed to set modification time")); + + if (stat(Itm->DestFile.c_str(),&Buf) != 0) + return _error->Errno("stat",_("Failed to stat")); + + // return done + Res.LastModified = Buf.st_mtime; + Res.Size = Buf.st_size; + Res.TakeHashes(Hash); + URIDone(Res); + + return true; +} + +int main(int argc, char *argv[]) +{ + RredMethod Mth; + + Prog = strrchr(argv[0],'/'); + Prog++; + + return Mth.Run(); +} diff --git a/po/apt-all.pot b/po/apt-all.pot index 978b0c191..d11b80123 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-25 15:34+0100\n" +"POT-Creation-Date: 2006-08-15 15:55+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,153 +15,153 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:143 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "" -#: 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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "" -#: cmdline/apt-cache.cc:247 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "" -#: cmdline/apt-cache.cc:287 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr "" -#: cmdline/apt-cache.cc:288 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:289 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:290 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:291 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr "" -#: cmdline/apt-cache.cc:293 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "" -#: cmdline/apt-cache.cc:295 +#: cmdline/apt-cache.cc:293 msgid "Total Distinct Descriptions: " msgstr "" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "" -#: cmdline/apt-cache.cc:300 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "" -#: cmdline/apt-cache.cc:302 +#: cmdline/apt-cache.cc:300 msgid "Total Desc/File relations: " msgstr "" -#: cmdline/apt-cache.cc:304 +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:330 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:335 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:343 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:1293 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "" -#: cmdline/apt-cache.cc:1447 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "" -#: cmdline/apt-cache.cc:1524 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "" -#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1544 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "" #. Installed version -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr "" -#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "" #. Candidate Version -#: cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1603 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1618 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr "" -#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 cmdline/apt-get.cc:2476 -#: cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 +#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1721 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -251,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:819 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "" @@ -260,11 +260,301 @@ msgstr "" msgid "Cannot get debconf version. Is debconf installed?" msgstr "" +#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +msgid "Package extension list is too long" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 +#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 +#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#, c-format +msgid "Error processing directory %s" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:254 +msgid "Source extension list is too long" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:371 +msgid "Error writing header to contents file" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:401 +#, c-format +msgid "Error processing contents %s" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:556 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:762 +msgid "No selections matched" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:835 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "" + +#: ftparchive/cachedb.cc:47 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "" + +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "" + +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#, c-format +msgid "Failed to stat %s" +msgstr "" + +#: ftparchive/cachedb.cc:242 +msgid "Archive has no control record" +msgstr "" + +#: ftparchive/cachedb.cc:448 +msgid "Unable to get a cursor" +msgstr "" + +#: ftparchive/writer.cc:79 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "" + +#: ftparchive/writer.cc:84 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "" + +#: ftparchive/writer.cc:135 +msgid "E: " +msgstr "" + +#: ftparchive/writer.cc:137 +msgid "W: " +msgstr "" + +#: ftparchive/writer.cc:144 +msgid "E: Errors apply to file " +msgstr "" + +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#, c-format +msgid "Failed to resolve %s" +msgstr "" + +#: ftparchive/writer.cc:173 +msgid "Tree walking failed" +msgstr "" + +#: ftparchive/writer.cc:198 +#, c-format +msgid "Failed to open %s" +msgstr "" + +#: ftparchive/writer.cc:257 +#, c-format +msgid " DeLink %s [%s]\n" +msgstr "" + +#: ftparchive/writer.cc:265 +#, c-format +msgid "Failed to readlink %s" +msgstr "" + +#: ftparchive/writer.cc:269 +#, c-format +msgid "Failed to unlink %s" +msgstr "" + +#: ftparchive/writer.cc:276 +#, c-format +msgid "*** Failed to link %s to %s" +msgstr "" + +#: ftparchive/writer.cc:286 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr "" + +#: ftparchive/writer.cc:390 +msgid "Archive had no package field" +msgstr "" + +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#, c-format +msgid " %s has no override entry\n" +msgstr "" + +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#, c-format +msgid " %s maintainer is %s not %s\n" +msgstr "" + +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr "" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr "" + +#: ftparchive/contents.cc:317 +#, c-format +msgid "Internal error, could not locate member %s" +msgstr "" + +#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +msgid "realloc - Failed to allocate memory" +msgstr "" + +#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#, c-format +msgid "Unable to open %s" +msgstr "" + +#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#, c-format +msgid "Malformed override %s line %lu #1" +msgstr "" + +#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#, c-format +msgid "Malformed override %s line %lu #2" +msgstr "" + +#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#, c-format +msgid "Malformed override %s line %lu #3" +msgstr "" + +#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#, c-format +msgid "Failed to read the override file %s" +msgstr "" + +#: ftparchive/multicompress.cc:75 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "" + +#: ftparchive/multicompress.cc:105 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "" + +#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +msgid "Failed to create IPC pipe to subprocess" +msgstr "" + +#: ftparchive/multicompress.cc:198 +msgid "Failed to create FILE*" +msgstr "" + +#: ftparchive/multicompress.cc:201 +msgid "Failed to fork" +msgstr "" + +#: ftparchive/multicompress.cc:215 +msgid "Compress child" +msgstr "" + +#: ftparchive/multicompress.cc:238 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "" + +#: ftparchive/multicompress.cc:289 +msgid "Failed to create subprocess IPC" +msgstr "" + +#: ftparchive/multicompress.cc:324 +msgid "Failed to exec compressor " +msgstr "" + +#: ftparchive/multicompress.cc:363 +msgid "decompressor" +msgstr "" + +#: ftparchive/multicompress.cc:406 +msgid "IO to subprocess/file failed" +msgstr "" + +#: ftparchive/multicompress.cc:458 +msgid "Failed to read while computing MD5" +msgstr "" + +#: ftparchive/multicompress.cc:475 +#, c-format +msgid "Problem unlinking %s" +msgstr "" + +#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "" + #: cmdline/apt-get.cc:121 msgid "Y" msgstr "" -#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -423,11 +713,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1907 cmdline/apt-get.cc:1940 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1988 cmdline/apt-get.cc:2224 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -456,7 +746,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -490,7 +780,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2121 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -499,7 +789,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "" @@ -599,55 +889,55 @@ msgstr "" msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1426 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1451 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1454 cmdline/apt-get.cc:1656 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1458 +#: cmdline/apt-get.cc:1447 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1477 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1575 cmdline/apt-get.cc:1611 +#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1598 +#: cmdline/apt-get.cc:1584 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1628 +#: cmdline/apt-get.cc:1614 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1631 +#: cmdline/apt-get.cc:1617 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1629 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" @@ -655,159 +945,159 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1651 +#: cmdline/apt-get.cc:1637 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:1659 +#: cmdline/apt-get.cc:1645 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1690 +#: cmdline/apt-get.cc:1676 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1779 +#: cmdline/apt-get.cc:1765 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1780 +#: cmdline/apt-get.cc:1766 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1800 +#: cmdline/apt-get.cc:1786 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1803 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1808 +#: cmdline/apt-get.cc:1794 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1875 cmdline/apt-get.cc:1883 +#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1983 +#: cmdline/apt-get.cc:1969 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2013 cmdline/apt-get.cc:2242 +#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2057 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2081 +#: cmdline/apt-get.cc:2067 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2086 +#: cmdline/apt-get.cc:2072 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2089 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2081 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2126 +#: cmdline/apt-get.cc:2112 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2166 +#: cmdline/apt-get.cc:2152 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2167 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2170 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2189 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2219 +#: cmdline/apt-get.cc:2205 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2247 +#: cmdline/apt-get.cc:2233 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2267 +#: cmdline/apt-get.cc:2253 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2319 +#: cmdline/apt-get.cc:2305 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2357 #, 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:2406 +#: cmdline/apt-get.cc:2392 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2431 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2445 +#: cmdline/apt-get.cc:2431 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2435 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2481 +#: cmdline/apt-get.cc:2467 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2522 +#: cmdline/apt-get.cc:2508 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1037,17 +1327,6 @@ msgstr "" msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:181 apt-inst/extract.cc:193 apt-inst/extract.cc:210 -#: apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 -#, c-format -msgid "Failed to stat %s" -msgstr "" - -#: apt-inst/extract.cc:188 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "" - #: apt-inst/extract.cc:243 #, c-format msgid "The directory %s is being replaced by a non-directory" @@ -1103,9 +1382,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:752 -#: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826 -#: apt-pkg/pkgcachegen.cc:949 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "" @@ -1234,11 +1513,13 @@ msgid "File not found" msgstr "" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: 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/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "" @@ -1364,7 +1645,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1485,86 +1766,86 @@ msgid "" "available:\n" msgstr "" -#: methods/gzip.cc:57 +#: 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:102 methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "" -#: methods/http.cc:376 +#: methods/http.cc:375 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:522 +#: methods/http.cc:521 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:530 +#: methods/http.cc:529 msgid "Bad header line" msgstr "" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:585 +#: methods/http.cc:584 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:600 +#: methods/http.cc:599 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:602 +#: methods/http.cc:601 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:874 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:876 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "" @@ -1637,12 +1918,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "" @@ -1774,111 +2055,109 @@ msgstr "" msgid "Problem syncing the file" msgstr "" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:143 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:153 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:158 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:229 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "" -#: apt-pkg/pkgcache.cc:229 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "" -#: apt-pkg/pkgcache.cc:229 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "" -#: apt-pkg/pkgcache.cc:230 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "" -#: apt-pkg/pkgcache.cc:230 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "" -#: apt-pkg/pkgcache.cc:230 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "" -#: apt-pkg/pkgcache.cc:231 -msgid "Breaks" -msgstr "" - -#: apt-pkg/pkgcache.cc:242 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "" -#: apt-pkg/pkgcache.cc:242 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "" -#: apt-pkg/pkgcache.cc:242 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "" -#: apt-pkg/pkgcache.cc:243 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "" -#: apt-pkg/pkgcache.cc:243 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 msgid "Reading state information" msgstr "" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, c-format msgid "Failed to open StateFile %s" msgstr "" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" @@ -1946,19 +2225,19 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:248 +#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1096 +#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1098 +#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" @@ -1994,7 +2273,7 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2118,53 +2397,54 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:682 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:767 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:980 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:675 +#: apt-pkg/acquire-item.cc:1097 msgid "There are no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:788 +#: apt-pkg/acquire-item.cc:1210 #, 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:847 +#: apt-pkg/acquire-item.cc:1269 #, 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:883 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:970 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "" @@ -2315,10 +2595,14 @@ msgstr "" msgid "Completely removed %s" msgstr "" -#: methods/rsh.cc:91 -msgid "Failed to create IPC pipe to subprocess" +#: methods/rred.cc:219 +msgid "Could not patch file" msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "" + +#: apt-pkg/acquire-item.cc:1097 +msgid "There is no public key available for the following key IDs:\n" +msgstr "" diff --git a/po/ar.po b/po/ar.po new file mode 100644 index 000000000..8a0b74706 --- /dev/null +++ b/po/ar.po @@ -0,0 +1,2566 @@ +# 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_po\n" +"Report-Msgid-Bugs-To: \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 "الحزمة %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 "" + +#: 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 +#, c-format +msgid " %4i %s\n" +msgstr " %4i %s\n" + +#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 +#: cmdline/apt-get.cc: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: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 "" + +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "الرجاء كتابة اسم لهذا القرص، مثال 'Debian 2.1r1 Disk 1'" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "الرجاء إدخال قرص في السواقة وضغط الزر enter" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "كرر هذه العملية لباقي الأقراص المدمجة في المجموعة." + +#: 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 "" + +#: cmdline/apt-extracttemplates.cc:98 +#, c-format +msgid "%s not a valid DEB package." +msgstr "%s ليس حزمة DEB صالحة." + +#: cmdline/apt-extracttemplates.cc:232 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" + +#: 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. هل هي مثبتة؟" + +#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +msgid "Package extension list is too long" +msgstr "قائمة توسيعات الحزمة طويلة جداً" + +#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 +#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 +#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#, c-format +msgid "Error processing directory %s" +msgstr "خطأ في معالجة الدليل %s" + +#: ftparchive/apt-ftparchive.cc:254 +msgid "Source extension list is too long" +msgstr "قائمة توسيعات المصدر طويلة جداً" + +#: ftparchive/apt-ftparchive.cc:371 +msgid "Error writing header to contents file" +msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات" + +#: ftparchive/apt-ftparchive.cc:401 +#, c-format +msgid "Error processing contents %s" +msgstr "خطأ في معالجة المحتويات %s" + +#: ftparchive/apt-ftparchive.cc:556 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" + +#: ftparchive/apt-ftparchive.cc:762 +msgid "No selections matched" +msgstr "لم تُطابق أية تحديدات" + +#: ftparchive/apt-ftparchive.cc:835 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'" + +#: ftparchive/cachedb.cc:47 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "قاعدة البيانات كانت فاسدة، فتم تغيير اسمها إلى %s.old" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "قاعدة البيانات قديمة، محاولة ترقية %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 "" + +#: ftparchive/cachedb.cc:81 +#, c-format +msgid "Unable to open DB file %s: %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 +#, c-format +msgid "Failed to stat %s" +msgstr "" + +#: ftparchive/cachedb.cc:242 +msgid "Archive has no control record" +msgstr "" + +#: ftparchive/cachedb.cc:448 +msgid "Unable to get a cursor" +msgstr "" + +#: ftparchive/writer.cc:79 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "W: تعذرت قراءة الدليل %s\n" + +#: ftparchive/writer.cc:84 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "" + +#: ftparchive/writer.cc:135 +msgid "E: " +msgstr "E: " + +#: ftparchive/writer.cc:137 +msgid "W: " +msgstr "W: " + +#: ftparchive/writer.cc:144 +msgid "E: Errors apply to file " +msgstr "" + +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#, c-format +msgid "Failed to resolve %s" +msgstr "" + +#: ftparchive/writer.cc:173 +msgid "Tree walking failed" +msgstr "" + +#: ftparchive/writer.cc:198 +#, c-format +msgid "Failed to open %s" +msgstr "فشل فتح %s" + +#: ftparchive/writer.cc:257 +#, c-format +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" + +#: ftparchive/writer.cc:265 +#, c-format +msgid "Failed to readlink %s" +msgstr "" + +#: ftparchive/writer.cc:269 +#, c-format +msgid "Failed to unlink %s" +msgstr "" + +#: ftparchive/writer.cc:276 +#, c-format +msgid "*** Failed to link %s to %s" +msgstr "*** فشل ربط %s بـ%s" + +#: ftparchive/writer.cc:286 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr "" + +#: ftparchive/writer.cc:390 +msgid "Archive had no package field" +msgstr "" + +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#, c-format +msgid " %s has no override entry\n" +msgstr "" + +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#, c-format +msgid " %s maintainer is %s not %s\n" +msgstr "" + +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr "" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr "" + +#: ftparchive/contents.cc:317 +#, c-format +msgid "Internal error, could not locate member %s" +msgstr "خطأ داخلي، تعذر العثور على العضو %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 "" + +#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#, c-format +msgid "Malformed override %s line %lu #2" +msgstr "" + +#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#, c-format +msgid "Malformed override %s line %lu #3" +msgstr "" + +#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#, c-format +msgid "Failed to read the override file %s" +msgstr "" + +#: ftparchive/multicompress.cc:75 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "" + +#: ftparchive/multicompress.cc:105 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "" + +#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +msgid "Failed to create IPC pipe to subprocess" +msgstr "" + +#: ftparchive/multicompress.cc:198 +msgid "Failed to create FILE*" +msgstr "" + +#: ftparchive/multicompress.cc:201 +msgid "Failed to fork" +msgstr "" + +#: ftparchive/multicompress.cc:215 +msgid "Compress child" +msgstr "" + +#: ftparchive/multicompress.cc:238 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "خطأ داخلي، تعذر إنشاء %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 "" + +#: ftparchive/multicompress.cc:458 +msgid "Failed to read while computing MD5" +msgstr "" + +#: ftparchive/multicompress.cc:475 +#, c-format +msgid "Problem unlinking %s" +msgstr "" + +#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "فشل تغيير اسم %s إلى %s" + +#: cmdline/apt-get.cc:120 +msgid "Y" +msgstr "Y" + +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#, c-format +msgid "Regex compilation error - %s" +msgstr "" + +#: cmdline/apt-get.cc:237 +msgid "The following packages have unmet dependencies:" +msgstr "" + +#: cmdline/apt-get.cc:327 +#, c-format +msgid "but %s is installed" +msgstr "إلا أن %s مثبت" + +#: cmdline/apt-get.cc:329 +#, c-format +msgid "but %s is to be installed" +msgstr "إلا أنه سيتم تثبيت %s" + +#: cmdline/apt-get.cc:336 +msgid "but it is not installable" +msgstr "إلا أنه غير قابل للتثبيت" + +#: cmdline/apt-get.cc:338 +msgid "but it is a virtual package" +msgstr "إلا أنها حزمة وهمية" + +#: cmdline/apt-get.cc:341 +msgid "but it is not installed" +msgstr "إلا أنها غير مثبتة" + +#: cmdline/apt-get.cc:341 +msgid "but it is not going to be installed" +msgstr "إلا أنه لن يتم تثبيتها" + +#: cmdline/apt-get.cc:346 +msgid " or" +msgstr " أو" + +#: cmdline/apt-get.cc:375 +msgid "The following NEW packages will be installed:" +msgstr "سيتم تثبيت الحزم الجديدة التالية:" + +#: cmdline/apt-get.cc:401 +msgid "The following packages will be REMOVED:" +msgstr "سيتم إزالة الحزم التالية:" + +#: cmdline/apt-get.cc:423 +msgid "The following packages have been kept back:" +msgstr "سيتم الإبقاء على الحزم التالية:" + +#: cmdline/apt-get.cc:444 +msgid "The following packages will be upgraded:" +msgstr "ستتم ترقية الحزم التالية:" + +#: cmdline/apt-get.cc:465 +msgid "The following packages will be DOWNGRADED:" +msgstr "سيتم تثبيط الحزم التالية:" + +#: cmdline/apt-get.cc:485 +msgid "The following held packages will be changed:" +msgstr "سيتم تغيير الحزم المبقاة التالية:" + +#: cmdline/apt-get.cc:538 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (بسبب %s) " + +#: cmdline/apt-get.cc:546 +msgid "" +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" +msgstr "" +"تحذير: ستتم إزالة الحزم الأساسية التالية.\n" +"لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!" + +#: cmdline/apt-get.cc:577 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، " + +#: cmdline/apt-get.cc:581 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu أعيد تثبيتها، " + +#: cmdline/apt-get.cc:583 +#, c-format +msgid "%lu downgraded, " +msgstr "%lu مثبطة، " + +#: cmdline/apt-get.cc:585 +#, c-format +msgid "%lu to remove and %lu not upgraded.\n" +msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n" + +#: cmdline/apt-get.cc:589 +#, c-format +msgid "%lu not fully installed or removed.\n" +msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" + +#: cmdline/apt-get.cc:649 +msgid "Correcting dependencies..." +msgstr "تصحيح المعتمدات..." + +#: cmdline/apt-get.cc:652 +msgid " failed." +msgstr " فشل." + +#: cmdline/apt-get.cc:655 +msgid "Unable to correct dependencies" +msgstr "لم يمكن تصحيح المعتمدات" + +#: cmdline/apt-get.cc:658 +msgid "Unable to minimize the upgrade set" +msgstr "لم يمكن تقليص مجموعة الترقية" + +#: cmdline/apt-get.cc:660 +msgid " Done" +msgstr " تم" + +#: cmdline/apt-get.cc:664 +msgid "You might want to run `apt-get -f install' to correct these." +msgstr "قد ترغب بتنفيذ الأمر `apt-get -f install' لتصحيح هذه." + +#: cmdline/apt-get.cc:667 +msgid "Unmet dependencies. Try using -f." +msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f." + +#: cmdline/apt-get.cc:689 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "تحذير: تعذرت المصادقة على الحزم التالية!" + +#: cmdline/apt-get.cc:693 +msgid "Authentication warning overridden.\n" +msgstr "تم غض النظر عن تحذير المصادقة.\n" + +#: cmdline/apt-get.cc:700 +msgid "Install these packages without verification [y/N]? " +msgstr "تثبيت هذه الحزم دون التحقق منها [y/N]؟ " + +#: cmdline/apt-get.cc:702 +msgid "Some packages could not be authenticated" +msgstr "تعذرت المصادقة على بعض الحزم" + +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +msgid "There are problems and -y was used without --force-yes" +msgstr "هناك مشاكل وتم استخدام -y دون --force-yes" + +#: cmdline/apt-get.cc:755 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!" + +#: cmdline/apt-get.cc:764 +msgid "Packages need to be removed but remove is disabled." +msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة." + +#: cmdline/apt-get.cc:775 +msgid "Internal error, Ordering didn't finish" +msgstr "خطأ داخلي، لم تنته عملية الترتيب" + +#: 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 "بحاجة إلى جلب %sب/%sب من الأرشيف.\n" + +#: cmdline/apt-get.cc:824 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "بحاجة إلى جلب %sب من الأرشيف.\n" + +#: cmdline/apt-get.cc:829 +#, c-format +msgid "After unpacking %sB of additional disk space will be used.\n" +msgstr "بعد الاستخراج %sب من المساحة الإضافيّة سيتمّ استخدامها.\n" + +#: cmdline/apt-get.cc:832 +#, c-format +msgid "After unpacking %sB disk space will be freed.\n" +msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\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 +#, c-format +msgid "Failed to fetch %s %s\n" +msgstr "فشل إحضار %s %s\n" + +#: cmdline/apt-get.cc:979 +msgid "Some files failed to download" +msgstr "فشل تنزيل بعض الملفات" + +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc: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 update أو إضافة --" +"fix-missing؟" + +#: cmdline/apt-get.cc:990 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً" + +#: cmdline/apt-get.cc:995 +msgid "Unable to correct missing packages." +msgstr "تعذر تصحيح الحزم المفقودة." + +#: cmdline/apt-get.cc:996 +msgid "Aborting install." +msgstr "إجهاض التثبيت." + +#: cmdline/apt-get.cc:1030 +#, c-format +msgid "Note, selecting %s instead of %s\n" +msgstr "لاحظ، تحديد %s بدلاً من %s\n" + +#: cmdline/apt-get.cc:1040 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n" + +#: cmdline/apt-get.cc:1058 +#, c-format +msgid "Package %s is not installed, so not removed\n" +msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n" + +#: cmdline/apt-get.cc:1069 +#, c-format +msgid "Package %s is a virtual package provided by:\n" +msgstr "الحزمة %s وهميّة وتوفّرها:\n" + +#: cmdline/apt-get.cc:1081 +msgid " [Installed]" +msgstr " [مُثبّتة]" + +#: cmdline/apt-get.cc:1086 +msgid "You should explicitly select one to install." +msgstr "يجب اختيار واحدة بالتحديد لتثبيتها." + +#: cmdline/apt-get.cc:1091 +#, c-format +msgid "" +"Package %s is not available, but is referred to by another package.\n" +"This may mean that the package is missing, has been obsoleted, or\n" +"is only available from another source\n" +msgstr "" + +#: cmdline/apt-get.cc:1110 +msgid "However the following packages replace it:" +msgstr "على أيّ فإن الحزم التالية تحلّ مكانها:" + +#: cmdline/apt-get.cc:1113 +#, c-format +msgid "Package %s has no installation candidate" +msgstr "الحزمة %s ليس لها مرشح تثبيت" + +#: cmdline/apt-get.cc:1133 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "إعادة تثبيت %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n" + +#: cmdline/apt-get.cc:1141 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s هي النسخة الأحدث.\n" + +#: cmdline/apt-get.cc:1168 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'" + +#: cmdline/apt-get.cc:1170 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'" + +#: cmdline/apt-get.cc:1176 +#, c-format +msgid "Selected version %s (%s) for %s\n" +msgstr "النسخة المحددة %s (%s) للإصدارة %s\n" + +#: cmdline/apt-get.cc:1313 +msgid "The update command takes no arguments" +msgstr "لا يقبل الأمر update أية مُعطيات" + +#: cmdline/apt-get.cc:1326 +msgid "Unable to lock the list directory" +msgstr "تعذر قفل دليل القائمة" + +#: cmdline/apt-get.cc:1384 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" + +#: cmdline/apt-get.cc:1403 +msgid "Internal error, AllUpgrade broke stuff" +msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" + +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#, c-format +msgid "Couldn't find package %s" +msgstr "تعذر العثور على الحزمة %s" + +#: cmdline/apt-get.cc:1516 +#, c-format +msgid "Note, selecting %s for regex '%s'\n" +msgstr "لاحظ، تحديد %s بسبب صيغة regex '%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 "" + +#: 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: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 "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n" + +#: cmdline/apt-get.cc:2000 +#, c-format +msgid "Need to get %sB of source archives.\n" +msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\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 "" + +#: 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 "" + +#: 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 "" + +#: cmdline/apt-get.cc:2178 +#, c-format +msgid "%s has no build depends.\n" +msgstr "" + +#: 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: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:2317 +#, c-format +msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" +msgstr "" + +#: cmdline/apt-get.cc:2342 +#, c-format +msgid "Failed to satisfy %s dependency for %s: %s" +msgstr "" + +#: cmdline/apt-get.cc:2356 +#, c-format +msgid "Build-dependencies for %s could not be satisfied." +msgstr "" + +#: 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 "" + +#: 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ب في %s (%sب/ث)\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 "" + +#: 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 "فشل تنفيذ 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 "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد" + +#: apt-inst/contrib/extracttar.cc:299 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "" + +#: apt-inst/contrib/arfile.cc:73 +msgid "Invalid archive signature" +msgstr "توقيع الأرشيف غير صالح" + +#: apt-inst/contrib/arfile.cc:81 +msgid "Error reading archive member header" +msgstr "" + +#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +msgid "Invalid archive member header" +msgstr "" + +#: apt-inst/contrib/arfile.cc:131 +msgid "Archive is too short" +msgstr "الأرشيف قصير جداً" + +#: apt-inst/contrib/arfile.cc:135 +msgid "Failed to read the archive headers" +msgstr "فشلت قراءة ترويسات الأرشيف" + +#: apt-inst/filelist.cc:384 +msgid "DropNode called on still linked node" +msgstr "" + +#: 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 "" + +#: apt-inst/filelist.cc:510 +#, c-format +msgid "Double add of diversion %s -> %s" +msgstr "" + +#: 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 "" + +#: apt-inst/extract.cc:147 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "" + +#: 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 "" + +#: 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 "" + +#: apt-inst/extract.cc:434 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "" + +#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/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 "" + +#: 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 "" + +#: apt-inst/deb/dpkgdb.cc:123 +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 +msgid "Reading package lists" +msgstr "قراءة قوائم الحزم" + +#: apt-inst/deb/dpkgdb.cc:180 +#, c-format +msgid "Failed to change to the admin dir %sinfo" +msgstr "فشل تغيير دليل الإدارة إلى %sinfo" + +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 +#: apt-inst/deb/dpkgdb.cc:448 +msgid "Internal error getting a package name" +msgstr "خطأ داخلي أثناء الحصول على اسم الحزمة" + +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +msgid "Reading file listing" +msgstr "قراءة سرد الملفات" + +#: apt-inst/deb/dpkgdb.cc:216 +#, c-format +msgid "" +"Failed to open the list file '%sinfo/%s'. If you cannot restore this file " +"then make it empty and immediately re-install the same version of the " +"package!" +msgstr "" + +#: 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 "خطأ داخلي أثناء الحصول على node" + +#: apt-inst/deb/dpkgdb.cc:309 +#, c-format +msgid "Failed to open the diversions file %sdiversions" +msgstr "" + +#: 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 "" + +#: apt-inst/deb/dpkgdb.cc:362 +msgid "Internal error adding a diversion" +msgstr "" + +#: apt-inst/deb/dpkgdb.cc:383 +msgid "The pkg cache must be initialized first" +msgstr "" + +#: apt-inst/deb/dpkgdb.cc:443 +#, c-format +msgid "Failed to find a Package: header, offset %lu" +msgstr "" + +#: apt-inst/deb/dpkgdb.cc:465 +#, c-format +msgid "Bad ConfFile section in the status file. Offset %lu" +msgstr "" + +#: apt-inst/deb/dpkgdb.cc:470 +#, c-format +msgid "Error parsing MD5. Offset %lu" +msgstr "" + +#: 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 "" + +#: apt-inst/deb/debfile.cc:52 +#, c-format +msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgstr "" + +#: apt-inst/deb/debfile.cc:112 +#, c-format +msgid "Couldn't change to %s" +msgstr "تعذر التغيير إلى %s" + +#: apt-inst/deb/debfile.cc:138 +msgid "Internal error, could not locate member" +msgstr "خطأ داخلي، تعذر العثور على العضو" + +#: apt-inst/deb/debfile.cc:171 +msgid "Failed to locate a valid control file" +msgstr "فشل العثور على ملف تحكّم صالح" + +#: apt-inst/deb/debfile.cc:256 +msgid "Unparsable control file" +msgstr "" + +#: methods/cdrom.cc:114 +#, c-format +msgid "Unable to read the cdrom database %s" +msgstr "تعذرت قراءة قاعدة بيانات القرص المدمج %s" + +#: 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 "القرص المدمج الخطأ" + +#: methods/cdrom.cc:164 +#, c-format +msgid "Unable to unmount the CD-ROM in %s, it may still be in use." +msgstr "تعذر فكّ القرص المدمج من %s، إذ قد يكون لا يزال قيد الاستخدام." + +#: methods/cdrom.cc:169 +msgid "Disk not found." +msgstr "لم يُعثر على القرص." + +#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +msgid "File not found" +msgstr "لم يُعثر على الملف" + +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 +#: methods/gzip.cc:150 +msgid "Failed to stat" +msgstr "فشيل تنفيذ stat" + +#: 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 "فشل USER، ردّ الخادم: %s" + +#: methods/ftp.cc:217 +#, c-format +msgid "PASS failed, server said: %s" +msgstr "فشل PASS، ردّ الخادم: %s" + +#: methods/ftp.cc:237 +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "" +"تم تحديد خادم بروكسي ولكن دون نص تسجيل دخول برمجي، Acquire::ftp::ProxyLogin " +"فارغ." + +#: methods/ftp.cc:265 +#, c-format +msgid "Login script command '%s' failed, server said: %s" +msgstr "فشل أمر نص تسجيل الدخول البرمجي '%s'، ردّ الخادم: %s" + +#: methods/ftp.cc:291 +#, c-format +msgid "TYPE failed, server said: %s" +msgstr "فشل TYPE، ردّ الخادم: %s" + +#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 +msgid "Connection timeout" +msgstr "انتهى وقت الاتصال" + +#: methods/ftp.cc:335 +msgid "Server closed the connection" +msgstr "أغلق الخادم الاتصال" + +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +msgid "Read error" +msgstr "خطأ في القراءة" + +#: methods/ftp.cc:345 methods/rsh.cc:197 +msgid "A response overflowed the buffer." +msgstr "" + +#: methods/ftp.cc:362 methods/ftp.cc:374 +msgid "Protocol corruption" +msgstr "" + +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +msgid "Write error" +msgstr "خطأ في الكتابة" + +#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 +msgid "Could not create a socket" +msgstr "" + +#: methods/ftp.cc:698 +msgid "Could not connect data socket, connection timed out" +msgstr "" + +#: methods/ftp.cc:704 +msgid "Could not connect passive socket." +msgstr "" + +#: methods/ftp.cc:722 +msgid "getaddrinfo was unable to get a listening socket" +msgstr "" + +#: methods/ftp.cc:736 +msgid "Could not bind a socket" +msgstr "" + +#: methods/ftp.cc:740 +msgid "Could not listen on the socket" +msgstr "" + +#: methods/ftp.cc:747 +msgid "Could not determine the socket's name" +msgstr "" + +#: methods/ftp.cc:779 +msgid "Unable to send PORT command" +msgstr "تعذر إرسال الأمر PORT" + +#: methods/ftp.cc:789 +#, c-format +msgid "Unknown address family %u (AF_*)" +msgstr "" + +#: methods/ftp.cc:798 +#, c-format +msgid "EPRT failed, server said: %s" +msgstr "فشل EPRT، ردّ الخادم: %s" + +#: methods/ftp.cc:818 +msgid "Data socket connect timed out" +msgstr "" + +#: methods/ftp.cc:825 +msgid "Unable to accept connection" +msgstr "تعذر قبول الاتصال" + +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +msgid "Problem hashing file" +msgstr "" + +#: methods/ftp.cc:877 +#, c-format +msgid "Unable to fetch file, server said '%s'" +msgstr "تعذر إحضار الملف، ردّ الخادم '%s'" + +#: methods/ftp.cc:892 methods/rsh.cc:322 +msgid "Data socket timed out" +msgstr "" + +#: methods/ftp.cc:922 +#, c-format +msgid "Data transfer failed, server said '%s'" +msgstr "فشل نقل البيانات، ردّ الخادم '%s'" + +#. Get the files information +#: methods/ftp.cc:997 +msgid "Query" +msgstr "استعلام" + +#: methods/ftp.cc:1109 +msgid "Unable to invoke " +msgstr "" + +#: methods/connect.cc:64 +#, c-format +msgid "Connecting to %s (%s)" +msgstr "الاتصال بـ%s (%s)" + +#: methods/connect.cc:71 +#, c-format +msgid "[IP: %s %s]" +msgstr "[IP: %s %s]" + +#: methods/connect.cc:80 +#, c-format +msgid "Could not create a socket for %s (f=%u t=%u p=%u)" +msgstr "" + +#: 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 "" + +#: methods/connect.cc:173 +#, c-format +msgid "Temporary failure resolving '%s'" +msgstr "" + +#: methods/connect.cc:176 +#, c-format +msgid "Something wicked happened resolving '%s:%s' (%i)" +msgstr "" + +#: 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 "" + +#: methods/gpgv.cc:100 +msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." +msgstr "" + +#: 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 "" + +#: methods/gpgv.cc:218 +msgid "Unknown error executing gpgv" +msgstr "" + +#: methods/gpgv.cc:249 +msgid "The following signatures were invalid:\n" +msgstr "" + +#: methods/gpgv.cc:256 +msgid "" +"The following signatures couldn't be verified because the public key is not " +"available:\n" +msgstr "" + +#: methods/gzip.cc:64 +#, c-format +msgid "Couldn't open pipe for %s" +msgstr "" + +#: methods/gzip.cc:109 +#, c-format +msgid "Read error from %s process" +msgstr "" + +#: methods/http.cc:376 +msgid "Waiting for headers" +msgstr "بانتظار الترويسات" + +#: methods/http.cc:522 +#, c-format +msgid "Got a single header line over %u chars" +msgstr "" + +#: methods/http.cc:530 +msgid "Bad header line" +msgstr "سطر ترويسة سيء" + +#: methods/http.cc:549 methods/http.cc:556 +msgid "The HTTP server sent an invalid reply header" +msgstr "أرسل خادم http ترويسة ردّ غير صالحة" + +#: methods/http.cc:585 +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "أرسل خادم http ترويسة طول محتويات (ِContent-Length) غير صالحة" + +#: methods/http.cc:600 +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "أرسل خادم http ترويسة مدى محتويات (ِContent-Range) غير صالحة" + +#: methods/http.cc:602 +msgid "This HTTP server has broken range support" +msgstr "خادم http له دعم مدى معطوب" + +#: methods/http.cc:626 +msgid "Unknown date format" +msgstr "نسق تاريخ مجهول" + +#: methods/http.cc:773 +msgid "Select failed" +msgstr "فشل التحديد" + +#: methods/http.cc:778 +msgid "Connection timed out" +msgstr "انتهى وقت الاتصال" + +#: methods/http.cc:801 +msgid "Error writing to output file" +msgstr "خطأ في الكتابة إلى ملف المُخرجات" + +#: methods/http.cc:832 +msgid "Error writing to file" +msgstr "خطأ في الكتابة إلى الملف" + +#: methods/http.cc:860 +msgid "Error writing to the file" +msgstr "خطأ في الكتابة إلى الملف" + +#: methods/http.cc:874 +msgid "Error reading from server. Remote end closed connection" +msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال" + +#: methods/http.cc:876 +msgid "Error reading from server" +msgstr "خطأ في القراءة من الخادم" + +#: methods/http.cc:1107 +msgid "Bad header data" +msgstr "بيانات ترويسة سيئة" + +#: methods/http.cc:1124 +msgid "Connection failed" +msgstr "فشل الاتصال" + +#: methods/http.cc:1215 +msgid "Internal error" +msgstr "خطأ داخلي" + +#: apt-pkg/contrib/mmap.cc:82 +msgid "Can't mmap an empty file" +msgstr "" + +#: apt-pkg/contrib/mmap.cc:87 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "" + +#: apt-pkg/contrib/strutl.cc:938 +#, c-format +msgid "Selection %s not found" +msgstr "تعذر العثور على التحديد %s" + +#: apt-pkg/contrib/configuration.cc:436 +#, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "اختصار نوع مجهول: '%c'" + +#: apt-pkg/contrib/configuration.cc:494 +#, c-format +msgid "Opening configuration file %s" +msgstr "فتح ملف التهيئة %s" + +#: apt-pkg/contrib/configuration.cc:512 +#, c-format +msgid "Line %d too long (max %d)" +msgstr "السطر %d طويل جداً (أقصاه %d)" + +#: apt-pkg/contrib/configuration.cc:608 +#, c-format +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "" + +#: apt-pkg/contrib/configuration.cc:627 +#, c-format +msgid "Syntax error %s:%u: Malformed tag" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:644 +#, c-format +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:684 +#, c-format +msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:691 +#, c-format +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#, c-format +msgid "Syntax error %s:%u: Included from here" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:704 +#, c-format +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "" + +#: apt-pkg/contrib/configuration.cc:738 +#, c-format +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "" + +#: apt-pkg/contrib/progress.cc:154 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... خطأ!" + +#: apt-pkg/contrib/progress.cc:156 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... تمّ" + +#: apt-pkg/contrib/cmndline.cc:80 +#, c-format +msgid "Command line option '%c' [from %s] is not known." +msgstr "خيار سطر الأمر '%c' [من %s] مجهول." + +#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 +#: apt-pkg/contrib/cmndline.cc:122 +#, c-format +msgid "Command line option %s is not understood" +msgstr "خيار سطر الأمر %s غير مفهوم" + +#: apt-pkg/contrib/cmndline.cc:127 +#, c-format +msgid "Command line option %s is not boolean" +msgstr "" + +#: 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 "" + +#: apt-pkg/contrib/cmndline.cc:237 +#, c-format +msgid "Option %s requires an integer argument, not '%s'" +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "" + +#: 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 "" + +#: apt-pkg/contrib/fileutl.cc:87 +#, c-format +msgid "Could not open lock file %s" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:105 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:109 +#, c-format +msgid "Could not get lock %s" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:377 +#, c-format +msgid "Waited for %s but it wasn't there" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:387 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:390 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:392 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:436 +#, c-format +msgid "Could not open file %s" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:492 +#, c-format +msgid "read, still have %lu to read but none left" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:522 +#, c-format +msgid "write, still have %lu to write but couldn't" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:597 +msgid "Problem closing the file" +msgstr "مشكلة في إغلاق الملف" + +#: apt-pkg/contrib/fileutl.cc:603 +msgid "Problem unlinking the file" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:614 +msgid "Problem syncing the file" +msgstr "مشكلة في مزامنة الملف" + +#: apt-pkg/pkgcache.cc:126 +msgid "Empty package cache" +msgstr "" + +#: apt-pkg/pkgcache.cc:132 +msgid "The package cache file is corrupted" +msgstr "" + +#: apt-pkg/pkgcache.cc:137 +msgid "The package cache file is an incompatible version" +msgstr "" + +#: apt-pkg/pkgcache.cc:142 +#, c-format +msgid "This APT does not support the versioning system '%s'" +msgstr "" + +#: apt-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 "" + +#: apt-pkg/tagfile.cc:193 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "" + +#: apt-pkg/sourcelist.cc:94 +#, c-format +msgid "Malformed line %lu in source list %s (URI)" +msgstr "" + +#: apt-pkg/sourcelist.cc:96 +#, c-format +msgid "Malformed line %lu in source list %s (dist)" +msgstr "" + +#: apt-pkg/sourcelist.cc:99 +#, c-format +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "" + +#: apt-pkg/sourcelist.cc:105 +#, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "" + +#: apt-pkg/sourcelist.cc:112 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "" + +#: apt-pkg/sourcelist.cc:203 +#, c-format +msgid "Opening %s" +msgstr "فتح %s" + +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#, c-format +msgid "Line %u too long in source list %s." +msgstr "" + +#: apt-pkg/sourcelist.cc:240 +#, c-format +msgid "Malformed line %u in source list %s (type)" +msgstr "" + +#: apt-pkg/sourcelist.cc:244 +#, c-format +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "" + +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#, c-format +msgid "Malformed line %u in source list %s (vendor id)" +msgstr "" + +#: 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 "" + +#: apt-pkg/pkgrecords.cc:37 +#, c-format +msgid "Index file type '%s' is not supported" +msgstr "" + +#: 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 "" + +#: apt-pkg/algorithms.cc:1059 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" + +#: apt-pkg/algorithms.cc:1061 +msgid "Unable to correct problems, you have held broken packages." +msgstr "" + +#: apt-pkg/acquire.cc:62 +#, c-format +msgid "Lists directory %spartial is missing." +msgstr "" + +#: apt-pkg/acquire.cc:66 +#, c-format +msgid "Archive directory %spartial is missing." +msgstr "" + +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "" + +#: apt-pkg/acquire.cc:825 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "" + +#: apt-pkg/acquire-worker.cc:113 +#, c-format +msgid "The method driver %s could not be found." +msgstr "" + +#: apt-pkg/acquire-worker.cc:162 +#, c-format +msgid "Method %s did not start correctly" +msgstr "" + +#: 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 "" + +#: apt-pkg/srcrecords.cc:48 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "" + +#: 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 "" + +#: apt-pkg/policy.cc:299 +msgid "No priority (or zero) specified for pin" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:74 +msgid "Cache has an incompatible versioning system" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:117 +#, c-format +msgid "Error occurred while processing %s (NewPackage)" +msgstr "حدث خطأ أثناء معالجة %s (NewPackage)" + +#: apt-pkg/pkgcachegen.cc:129 +#, c-format +msgid "Error occurred while processing %s (UsePackage1)" +msgstr "حدث خطأ أثناء معالجة %s (UserPackage1)" + +#: apt-pkg/pkgcachegen.cc:150 +#, c-format +msgid "Error occurred while processing %s (UsePackage2)" +msgstr "حدث خطأ أثناء معالجة %s (UserPackage2)" + +#: apt-pkg/pkgcachegen.cc:154 +#, c-format +msgid "Error occurred while processing %s (NewFileVer1)" +msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:184 +#, c-format +msgid "Error occurred while processing %s (NewVersion1)" +msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)" + +#: apt-pkg/pkgcachegen.cc:188 +#, c-format +msgid "Error occurred while processing %s (UsePackage3)" +msgstr "حدث خطأ أثناء معالجة %s (UsePackage3)" + +#: apt-pkg/pkgcachegen.cc:192 +#, c-format +msgid "Error occurred while processing %s (NewVersion2)" +msgstr "حدث خطأ أثناء معالجة %s (NewVersion2)" + +#: apt-pkg/pkgcachegen.cc:207 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "" + +#: apt-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 "" + +#: apt-pkg/pkgcachegen.cc:254 +#, c-format +msgid "Error occurred while processing %s (CollectFileProvides)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:260 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:574 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:658 +msgid "Collecting File Provides" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +msgid "IO Error saving source cache" +msgstr "" + +#: apt-pkg/acquire-item.cc:126 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "فشل إعادة التسمية ، %s (%s -> %s)." + +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +msgid "MD5Sum mismatch" +msgstr "MD5Sum غير متطابقة" + +#: apt-pkg/acquire-item.cc:640 +msgid "There is no public key available for the following key IDs:\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:753 +#, c-format +msgid "" +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package. (due to missing arch)" +msgstr "" + +#: apt-pkg/acquire-item.cc:812 +#, c-format +msgid "" +"I wasn't able to locate file for the %s package. This might mean you need to " +"manually fix this package." +msgstr "" + +#: apt-pkg/acquire-item.cc:848 +#, c-format +msgid "" +"The package index files are corrupted. No Filename: field for package %s." +msgstr "" + +#: 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 "" + +#: apt-pkg/cdrom.cc:507 +#, 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 +msgid "Identifying.. " +msgstr "جاري التعرف..." + +#: apt-pkg/cdrom.cc:541 +#, c-format +msgid "Stored label: %s \n" +msgstr "" + +#: apt-pkg/cdrom.cc:561 +#, c-format +msgid "Using CD-ROM mount point %s\n" +msgstr "" + +#: apt-pkg/cdrom.cc:579 +msgid "Unmounting CD-ROM\n" +msgstr "فك تركيب القرص المدمج\n" + +#: apt-pkg/cdrom.cc:583 +msgid "Waiting for disc...\n" +msgstr "بانتظار القرص...\n" + +#. Mount the new CDROM +#: apt-pkg/cdrom.cc:591 +msgid "Mounting CD-ROM...\n" +msgstr "تركيب القرص...\n" + +#: apt-pkg/cdrom.cc:609 +msgid "Scanning disc for index files..\n" +msgstr "" + +#: apt-pkg/cdrom.cc:647 +#, c-format +msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgstr "" + +#: apt-pkg/cdrom.cc:710 +msgid "That is not a valid name, try again.\n" +msgstr "هذا الاسم غير صالح، حاول مجدداً.\n" + +#: apt-pkg/cdrom.cc:726 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"هذا القرص مسمى: \n" +"'%s'\n" + +#: apt-pkg/cdrom.cc:730 +msgid "Copying package lists..." +msgstr "نسخ قوائم الحزم..." + +#: apt-pkg/cdrom.cc:754 +msgid "Writing new source list\n" +msgstr "كتابة لائحة المصادر الجديدة\n" + +#: apt-pkg/cdrom.cc:763 +msgid "Source list entries for this disc are:\n" +msgstr "" + +#: apt-pkg/cdrom.cc:803 +msgid "Unmounting CD-ROM..." +msgstr "فك تركيب القرص المدمج..." + +#: apt-pkg/indexcopy.cc:261 +#, c-format +msgid "Wrote %i records.\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:263 +#, c-format +msgid "Wrote %i records with %i missing files.\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:266 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:269 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "" + +#: 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 "" + +#~ 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-08-09 23:46+0200\n" -"PO-Revision-Date: 2006-03-31 22:05+0300\n" +"POT-Creation-Date: 2006-08-15 15:55+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" @@ -16,146 +16,156 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, 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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Пакетът %s не може да бъде намерен" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Общо имена на пакети : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Нормални пакети: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Чисти виртуални пакети: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Единични виртуални пакети: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Смесени виртуални пакети: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Липсващи: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Общо уникални версии: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Общо уникални версии: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Общо зависимости: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Общо отношения версия/файл: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Общо отношения версия/файл: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Общо отношения „Осигурява“: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Общо разгърнати низове: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Общо пространство за зависимости по версии: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Общо празно пространство: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Общо отчетено пространство: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Пакетният файл %s не е синхронизиран." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Трябва да въведете само един израз" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Няма намерени пакети" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Пакетни файлове:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Кешът не е синхронизиран, не може да се изпълни „x-ref“ на пакетен файл" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Отбити пакети:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(не са намерени)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Инсталирана: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(няма)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Кандидат: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Отбиване на пакета: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Таблица с версиите:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s за %s %s, компилиран на %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -306,7 +316,7 @@ msgstr "" " -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Неуспех при записа на %s" @@ -448,6 +458,8 @@ 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 @@ -544,14 +556,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " поддържащия пакета %s е %s, а не %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s няма запис „override“\n" +msgstr " %s няма запис „source override“\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s няма запис „override“\n" +msgstr " %s няма също и запис „binary override“\n" #: ftparchive/contents.cc:317 #, c-format @@ -753,121 +765,121 @@ msgstr "%lu за премахване и %lu без промяна.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu не са напълно инсталирани или премахнати.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Коригиране на зависимостите..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " пропадна." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Неуспех при коригирането на зависимостите" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Неуспех при минимизирането на набора актуализации" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Готово" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Възможно е да изпълните „apt-get -f install“, за да коригирате тези " "неизправности." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Неудовлетворени зависимости. Опитайте с „-f“." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Предупреждението за удостоверяването е пренебрегнато.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Инсталиране на тези пакети без проверка [y/N]?" -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Някои пакети не можаха да бъдат удостоверени" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Има проблеми и „-y“ е използвано без „--force-yes“" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Вътрешна грешка, „Ordering“ не завърши" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Неуспех при заключването на директорията за изтегляне" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Списъкът с източници не можа да бъде прочетен." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Странно.. Размерите не съвпадат, изпратете е-поща на apt@packages.debian.org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Необходимо е да се изтеглят %sB/%sB архиви.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "След разпакетирането ще бъде използвано %sB дисково пространство.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "След разпакетирането ще бъде освободено %sB дисково пространство.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "Неуспех при определянето на свободното пространство в %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Нямате достатъчно свободно пространство в %s." -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Указано е „Trivial Only“, но това не е тривиална операция." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Да, прави каквото казвам!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -878,28 +890,28 @@ msgstr "" "За да продължите, въведете фразата „%s“\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Прекъсване." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Искате ли да продължите [Y/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Някои файлове не можаха да бъдат изтеглени" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Изтеглянето завърши в режим само на изтегляне" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -907,47 +919,47 @@ msgstr "" "Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ " "или да опитате с „--fix-missing“?" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "„--fix-missing“ и превключване на носители не се поддържа все още" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Неуспех при коригирането на липсващите пакети." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Прекъсване на инсталирането." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Забележете, избиране на %s вместо %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Пакетът %s не е инсталиран, така че не е премахнат\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Пакетът %s е виртуален пакет, осигурен от:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Инсталиран]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Трябва изрично да изберете един за инсталиране." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -958,49 +970,49 @@ msgstr "" "Това може да означава, че пакета липсва, остарял е, или е достъпен\n" "само от друг източник\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Обаче следните пакети го заместват:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Пакетът %s няма кандидат за инсталиране" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s вече е най-новата версия.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Не е намерено издание „%s“ на „%s“" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Не е намерена версия „%s“ на „%s“" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Избрана е версия %s (%s) за %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Командата „update“ не възприема аргументи" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Неуспех при заключването на директорията със списъка на пакетите" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1008,27 +1020,27 @@ msgstr "" "Някои индексни файлове не можаха да бъдат изтеглени, те са пренебрегнати или " "са използвани по-стари." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "" "Следната информация може да помогне за намиране на изход от ситуацията:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата" @@ -1572,9 +1584,9 @@ msgstr "" "Директориите info и temp трябва да бъдат на една и съща файлова система" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Четене на списъците с пакети" @@ -1708,11 +1720,13 @@ msgid "File not found" msgstr "Файлът не е намерен" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: 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/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Неуспех при задаването на време на промяна" @@ -1842,7 +1856,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблем при хеширане на файла" @@ -1927,9 +1941,9 @@ msgid "Unable to connect to %s %s:" msgstr "Неуспех при свързването с %s %s:" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Неуспех при намирането на IP адреса на „%s“" +msgstr "Неуспех при достъпа до набор на ключове: „%s“" #: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." @@ -1949,9 +1963,11 @@ msgid "At least one invalid signature was encountered." msgstr "Намерен е поне един невалиден подпис." #: methods/gpgv.cc:213 -#, fuzzy, c-format +#, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr " за проверка на подписа (инсталиран ли е gnupg?)" +msgstr "" +"Неуспех при изпълнението на „%s“ за проверка на подписа (инсталиран ли е " +"gnupg?)" #: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" @@ -1969,86 +1985,86 @@ msgstr "" "Следните подписи не можаха да бъдат проверени, защото публичния ключ не е " "наличен:\n" -#: methods/gzip.cc:57 +#: 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:102 methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Грешка при четене от процес %s" -#: methods/http.cc:376 +#: methods/http.cc:375 msgid "Waiting for headers" msgstr "Чакане на заглавни части" -#: methods/http.cc:522 +#: methods/http.cc:521 #, c-format msgid "Got a single header line over %u chars" msgstr "Получен е един ред на заглавна част с над %u символа" -#: methods/http.cc:530 +#: methods/http.cc:529 msgid "Bad header line" msgstr "Невалиден ред на заглавна част" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор" -#: methods/http.cc:585 +#: methods/http.cc:584 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“" -#: methods/http.cc:600 +#: methods/http.cc:599 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“" -#: methods/http.cc:602 +#: methods/http.cc:601 msgid "This HTTP server has broken range support" msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "Неизвестен формат на дата" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Неуспех на избора" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Допустимото време за свързване изтече" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Грешка при записа на изходен файл" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Грешка при записа на файл" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Грешка при записа на файла" -#: methods/http.cc:874 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката" -#: methods/http.cc:876 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Грешка при четене от сървъра" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Невалидни данни на заглавната част" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Неуспех при свързването" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Вътрешна грешка" @@ -2061,7 +2077,7 @@ msgstr "Невъзможно е да се прехвърли в паметта msgid "Couldn't make mmap of %lu bytes" msgstr "Неуспех при прехвърлянето в паметта на %lu байта" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Изборът %s не е намерен" @@ -2123,12 +2139,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Готово" @@ -2263,108 +2279,110 @@ msgstr "Проблем при премахването на връзка към msgid "Problem syncing the file" msgstr "Проблем при синхронизиране на файла" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Празен кеш на пакети" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Файлът за кеш на пакети е повреден" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Файлът за кеш на пакети е несъвместима версия" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Тази версия на APT не поддържа система за версии „%s“" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Кешът на пакети е бил направен за различна архитектура" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Зависи от" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Предварително зависи от" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Предлага се" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Препоръчва се" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Конфликтира с" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Заменя" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Изважда от употреба" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "важен" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "изискван" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "стандартен" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "незадължителен" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "допълнителен" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Изграждане на дървото със зависимости" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Версии кандидати" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Генериране на зависимости" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Смесване на наличната информация" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Неуспех при отварянето на %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Неуспех при запис на файл %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Неуспех при анализирането на пакетен файл %s (2)" @@ -2401,7 +2419,7 @@ msgstr "" msgid "Opening %s" msgstr "Отваряне на %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Ред %u в списъка с източници %s е твърде дълъг." @@ -2474,14 +2492,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)" #: 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 @@ -2493,17 +2511,17 @@ msgstr "Неуспех при намирането на драйвер за ме msgid "Method %s did not start correctly" msgstr "Методът %s не стартира правилно" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“." -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Пакетната система „%s“ не е поддържана" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Неуспех при определянето на подходяща пакетна система" @@ -2549,94 +2567,111 @@ msgstr "Кешът има несъвместима система за верс msgid "Error occurred while processing %s (NewPackage)" msgstr "Възникна грешка при обработката на %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Възникна грешка при обработката на %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Възникна грешка при обработката на %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Възникна грешка при обработката на %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Възникна грешка при обработката на %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Възникна грешка при обработката на %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Възникна грешка при обработката на %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Възникна грешка при обработката на %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Възникна грешка при обработката на %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на " "APT." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Възникна грешка при обработката на %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Възникна грешка при обработката на %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "" "Неуспех при получаването на атрибути на списъка с пакети с изходен код %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Събиране на информация за „Осигурява“" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "преименуването се провали, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "Несъответствие на контролна сума MD5" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2645,7 +2680,7 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет (поради пропусната архитектура)." -#: apt-pkg/acquire-item.cc:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2654,14 +2689,14 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет." -#: apt-pkg/acquire-item.cc:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s." -#: apt-pkg/acquire-item.cc:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Несъответствие на размера" @@ -2670,7 +2705,7 @@ msgstr "Несъответствие на размера" msgid "Vendor block %s contains no fingerprint" msgstr "Блокът на производителя %s не съдържа отпечатък" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2679,49 +2714,51 @@ msgstr "" "Използване на точка за монтиране на CD-ROM %s\n" "Монтиране на CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Идентифициране..." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Запазен етикет: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Използване на точка за монтиране на CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Демонтиране на CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Чакане за диск...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Монтиране на CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Сканиране на диска за индексни файлове...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" "Намерени са %i индекса на пакети, %i индекса на пакети с изходен код и %i " "подписа.\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Това не е валидно име, опитайте отново.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2730,38 +2767,38 @@ msgstr "" "Наименование на този диск: \n" "„%s“\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Копиране на списъците с пакети..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Запазване на новия списък с източници\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Записите в списъка с източници за този диск са:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Демонтиране на CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Записани са %i записа.\n" -#: 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 "Записани са %i записа с %i липсващи файла.\n" -#: 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 "Записани са %i записа с %i несъответстващи файла\n" -#: 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 "Записани са %i записа с %i липсващи и %i несъответстващи файла\n" @@ -2807,30 +2844,25 @@ 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/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Неуспех при отварянето на файла %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Връзката прекъсна преждевременно" -#~ msgid "File date has changed %s" -#~ 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 е премахнат с конфигурационните файлове" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +msgid "There is no public key available for the following key IDs:\n" +msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" +"POT-Creation-Date: 2006-08-15 15:55+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" @@ -14,145 +14,155 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paket %s verzije %s ima nezadovoljenu zavisnost:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Ne mogu pronaći paket %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Ukupno naziva paketa:" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Normalni paketi:" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Čisto virtuelni paketi:" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Pojedinačni virutuelni paketi:" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Miješani virtuelni paketi:" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Nedostajući:" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Ukupno različitih verzija:" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Ukupno različitih verzija:" + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Ukupno zavisnosti:" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Ukupno Verzija/Datoteka odnosa:" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Ukupno Verzija/Datoteka odnosa:" + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Paketi nisu pronađeni" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Datoteke paketa:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Instalirano:" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr "" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 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:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -254,7 +264,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Ne mogu zapisati na %s" @@ -658,119 +668,119 @@ msgstr "" msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Ispravljam zavisnosti..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Ne mogu ispraviti zavisnosti" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Urađeno" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "Slijedeći paketi će biti nadograđeni:" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Da, uradi kako kažem!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -778,75 +788,75 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Odustani." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Odustajem od instalacije." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr "[Instalirano]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -854,73 +864,73 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Međutim, slijedeći paketi ga zamjenjuju:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "" @@ -1389,9 +1399,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:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Čitam spiskove paketa" @@ -1522,11 +1532,13 @@ msgid "File not found" msgstr "Datoteka nije pronađena" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: 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/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "" @@ -1653,7 +1665,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1775,86 +1787,86 @@ msgid "" "available:\n" msgstr "" -#: methods/gzip.cc:57 +#: 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:102 methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "" -#: methods/http.cc:376 +#: methods/http.cc:375 msgid "Waiting for headers" msgstr "Čekam na zaglavlja" -#: methods/http.cc:522 +#: methods/http.cc:521 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:530 +#: methods/http.cc:529 msgid "Bad header line" msgstr "" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:585 +#: methods/http.cc:584 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:600 +#: methods/http.cc:599 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:602 +#: methods/http.cc:601 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:874 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:876 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Povezivanje neuspješno" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Unutrašnja greška" @@ -1867,7 +1879,7 @@ msgstr "" msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "" @@ -1927,12 +1939,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "" @@ -2064,109 +2076,111 @@ msgstr "" msgid "Problem syncing the file" msgstr "" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Zavisi" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Unaprijed zavisi" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Predlaže" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Preporučuje" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 #, fuzzy msgid "Conflicts" msgstr "Sukobljava se sa" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Zamjenjuje" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Zastarijeva" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "važno" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "zahtijevano" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standardno" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcionalno" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Gradim stablo zavisnosti" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Verzije kandidata" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Stvaranje zavisnosti" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Sastavljam dostupne informacije" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Ne mogu otvoriti %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Ne mogu ukloniti %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" @@ -2201,7 +2215,7 @@ msgstr "" msgid "Opening %s" msgstr "Otvaram %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "" @@ -2282,17 +2296,17 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2335,110 +2349,125 @@ msgstr "" msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 msgid "There are no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "" @@ -2447,94 +2476,96 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 #, fuzzy msgid "Waiting for disc...\n" msgstr "Čekam na zaglavlja" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:673 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 #, fuzzy msgid "Copying package lists..." msgstr "Čitam spiskove paketa" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "" -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -2589,9 +2620,17 @@ msgstr "" msgid "Completely removed %s" msgstr "Ne mogu ukloniti %s" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "" +#: apt-pkg/acquire-item.cc:1097 +msgid "There is no public key available for the following key IDs:\n" +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-08-09 23:46+0200\n" +"POT-Creation-Date: 2006-08-15 15:55+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" @@ -16,146 +16,156 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "El paquet %s versió %s té una dependència sense satisfer:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "No s'ha trobat el paquet %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Nombre total de paquets: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Paquets normals: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Paquets virtuals purs: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Paquets virtuals únics: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Paquets virtuals mixtes: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Falten: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Total de versions diferents: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Total de versions diferents: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Total de dependències: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Total de relacions versió/fitxer: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Total de relacions versió/fitxer: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Total dels mapes aportats: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Total de cadenes globals: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Total de l'espai per a dependències de versió: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Total de l'espai desperdiciat: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Total de l'espai atribuit a: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "El fitxer %s del paquet està desincronitzat." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Heu de donar exactament un patró" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "No s'han trobat paquets" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Fitxers de paquets:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Memòria cau no sincronitzada, no es pot fer x-ref a un fitxer del paquet" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Paquets etiquetats:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(no trobat)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Instal·lat: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(cap)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Candidat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Etiqueta del paquet: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Taula de versió:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s per a %s %s compilat el %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -303,7 +313,7 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "No es pot escriure en %s" @@ -441,6 +451,8 @@ 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 @@ -529,22 +541,22 @@ msgstr "Arxiu sense el camp paquet" #: 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: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 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s no té una entrada dominant\n" +msgstr " %s no té una entrada dominant de font\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s no té una entrada dominant\n" +msgstr " %s no té una entrada dominant de binari\n" #: ftparchive/contents.cc:317 #, c-format @@ -746,121 +758,121 @@ msgstr "%lu a eliminar i %lu no actualitzats.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu no instal·lats o eliminats completament.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "S'estan corregint les dependències..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " ha fallat." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "No es poden corregir les dependències" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "No es pot minimitzar el joc de versions revisades" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Fet" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Dependències sense satisfer. Proveu-ho usant -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVÍS: No es poden autenticar els següents paquets!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "S'ha descartat l'avís d'autenticació.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "No s'ha pogut autenticar alguns paquets" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Hi ha problemes i s'ha usat -y sense --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets " "trencats!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "S'ha produït un error intern, l'ordenació no ha acabat" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "No s'ha pogut llegir la llista de les fonts." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Què estrany... les mides no coincideixen, informeu a apt@packages.debian.org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Es necessita obtenir %sB/%sB d'arxius.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Es necessita obtenir %sB d'arxius.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Després de desempaquetar s'usaran %sB d'espai en disc addicional.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Després de desempaquetar s'alliberaran %sB d'espai en disc.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "No teniu prou espai lliure en %s." -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Es va especificar Trivial Only però aquesta operació no és trivial." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Sí, fes el que et dic!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -871,28 +883,28 @@ msgstr "" "Per a continuar escriviu la frase «%s»\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Avortat." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut descarregar" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Descàrrega completa i en mode de només descàrrega" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -900,48 +912,48 @@ msgstr "" "No es poden descarregar alguns arxius, potser executant apt-get update o " "intenteu-ho amb --fix-missing." -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i medi d'intercanvi actualment no estan suportats" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "No es poden corregir els paquets que falten." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "S'està avortant la instal·lació." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota: s'està seleccionant %s en comptes de %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "El paquet %s no està instal·lat, així que no s'eliminarà\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquet %s és un paquet virtual proveït per:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Instal·lat]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Necessiteu seleccionar-ne un explícitament per a instal·lar-lo." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -952,50 +964,50 @@ msgstr "" "en fa referència. Això normalment vol dir que el paquet falta,\n" "s'ha tornat obsolet o només és disponible des d'una altra font.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Tot i que els següents paquets el reemplacen:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "El paquet %s no té candidat d'instal·lació" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "No es possible la reinstal·lació del paquet %s, no es pot descarregar.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ja es troba en la versió més recent.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No s'ha trobat la versió puntual «%s» per a «%s»" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No s'ha trobat la versió «%s» per a «%s»" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versió seleccionada %s (%s) per a %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "No es pot blocar el directori de la llista" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1003,27 +1015,27 @@ msgstr "" "No es poden descarregar alguns fitxers índex, s'han ignorat o en el seu lloc " "s'han usat els antics." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "La següent informació pot ajudar-vos a resoldre la situació:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "" "S'ha produït un error intern, el solucionador de problemes ha trencat coses" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" @@ -1571,9 +1583,9 @@ msgstr "" "fitxers" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "S'està llegint la llista de paquets" @@ -1707,11 +1719,13 @@ msgid "File not found" msgstr "Fitxer no trobat" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: methods/gzip.cc:141 methods/gzip.cc:150 msgid "Failed to stat" msgstr "L'estat ha fallat" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" @@ -1840,7 +1854,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" @@ -1917,7 +1931,7 @@ 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 @@ -1925,9 +1939,9 @@ msgid "Unable to connect to %s %s:" msgstr "No es pot connectar amb %s %s:" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, 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:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." @@ -1947,9 +1961,11 @@ msgid "At least one invalid signature was encountered." msgstr "S'ha trobat almenys una signatura invàlida." #: methods/gpgv.cc:213 -#, fuzzy, c-format +#, 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:218 msgid "Unknown error executing gpgv" @@ -1967,86 +1983,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: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: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:375 msgid "Waiting for headers" msgstr "S'estan esperant les capçaleres" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Línia de capçalera incorrecta" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 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:584 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:599 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:601 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:625 msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Error escrivint en el fitxer d'eixida" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Error llegint des del servidor" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Error intern" @@ -2059,7 +2075,7 @@ msgstr "No es pot transferir un fitxer buit a memòria" msgid "Couldn't make mmap of %lu bytes" msgstr "No s'ha pogut crear un mapa de memòria de %lu octets" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "No s'ha trobat la selecció %s" @@ -2119,12 +2135,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fet" @@ -2256,108 +2272,110 @@ msgstr "Ha hagut un problema en desenllaçar el fitxer" msgid "Problem syncing the file" msgstr "Ha hagut un problema en sincronitzar el fitxer" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Memòria cau de paquets és buida" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "El fitxer de memòria cau de paquets està corromput" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "El fitxer de memòria cau de paquets és una versió incompatible" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Aquest APT no suporta el sistema de versions '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "La memòria cau de paquets fou creada per a una arquitectura diferent" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depén" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Predepén" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Suggereix" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recomana" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Entra en conflicte" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Reemplaça" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Fa obsolet" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "requerit" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "estàndard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "S'està construint l'arbre de dependències" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Versions candidates" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Dependències que genera" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "S'està fusionant la informació disponible" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "No s'ha pogut obrir %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "No s'ha pogut escriure el fitxer %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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 "No es pot analitzar el fitxer del paquet %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 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)" @@ -2392,7 +2410,7 @@ msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)" msgid "Opening %s" msgstr "S'està obrint %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "La línia %u és massa llarga en la llista de fonts %s." @@ -2463,14 +2481,14 @@ 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 +#, 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 +#, 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 @@ -2482,17 +2500,17 @@ msgstr "No s'ha pogut trobar el mètode de control %s." msgid "Method %s did not start correctly" msgstr "El mètode %s no s'ha iniciat correctament" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro." -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema d'empaquetament '%s' no està suportat" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat." @@ -2537,94 +2555,112 @@ msgstr "La memòria cau té un sistema de versions incompatible" msgid "Error occurred while processing %s (NewPackage)" msgstr "S'ha produït un error durant el processament de %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "S'ha produït un error durant el processament de %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "S'ha produït un error durant el processament de %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "S'ha produït un error durant el processament de %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "S'ha produït un error durant el processament de %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "S'ha produït un error durant el processament de %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Uau, heu excedit el nombre de paquets dels que aquest APT és capaç." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Uau, heu excedit el nombre de versions de les que aquest APT és capaç. " -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Uau, heu excedit el nombre de versions de les que aquest APT és capaç. " + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Uau, heu excedit el nombre de dependències de les que aquest APT és capaç." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "S'ha produït un error durant el processament de %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" "S'ha produït un error durant el processament de %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "No s'ha trobat el paquet %s %s en processar les dependències del fitxer" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "No s'ha pogut llegir la llista de paquets font %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "S'estan recollint els fitxers que proveeixen" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "Error d'E/S en desar la memòria cau de la font" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format 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:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "Suma MD5 diferent" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2634,7 +2670,7 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2643,7 +2679,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:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2651,7 +2687,7 @@ msgstr "" "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." -#: apt-pkg/acquire-item.cc:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "La mida no concorda" @@ -2660,7 +2696,7 @@ msgstr "La mida no concorda" msgid "Vendor block %s contains no fingerprint" msgstr "El camp del proveïdor %s no té una empremta digital" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2669,47 +2705,49 @@ msgstr "" "S'està utilitzant el punt de muntatge de CD-ROM %s\n" "S'està muntant el CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "S'està identificant..." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "S'ha emmagatzemat l'etiqueta: %s\n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "S'està utilitzant el punt de muntatge de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "S'està desmuntant el CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "S'està esperant al disc...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "S'està muntant el CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "S'està analitzant el disc per a fitxers d'índex...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation 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:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2718,38 +2756,38 @@ msgstr "" "El disc es diu:\n" "«%s»\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "S'estan copiant les llistes de paquets..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 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:792 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 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "S'esta desmuntant el CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "S'han escrit %i registres.\n" -#: 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 "S'han escrit %i registres, on falten %i fitxers.\n" -#: 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 "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n" -#: 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 "" @@ -2759,7 +2797,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 @@ -2769,47 +2807,57 @@ 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/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "No s'ha pogut obrir el fitxer %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "La connexió s'ha tancat prematurament" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +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" + #~ msgid "File date has changed %s" #~ msgstr "La data del fitxer ha canviat %s" @@ -2,157 +2,168 @@ # 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-08-09 23:46+0200\n" -"PO-Revision-Date: 2006-05-14 18:36+0200\n" +"POT-Creation-Date: 2006-08-15 15:55+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Balík %s verze %s má nesplněné závislosti:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Nemohu najít balík %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Celkem názvů balíků: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Normálních balíků: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Čistě virtuálních balíků: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Jednoduchých virtuálních balíků: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Smíšených virtuálních balíků: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Chybějících: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Celkem různých verzí: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Celkem různých verzí: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Celkem závislostí: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Celkem vztahů ver/soubor: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Celkem vztahů ver/soubor: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Celkem poskytnutých mapování: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Celkem globovaných řetězců: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Celkem místa závislých verzí: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Celkem jalového místa: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Celkem přiřazeného místa: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Soubor balíku %s je špatně synchronizovaný." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Musíte zadat právě jeden vzor" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Nebyly nalezeny žádné balíky" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Soubory balíku:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache není synchronizovaná, nemohu se odkázat na soubor balíku" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Vypíchnuté balíky:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(nenalezeno)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Instalovaná verze: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(žádná)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Kandidát: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Vypíchnutý balík: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Tabulka verzí:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pro %s %s zkompilován na %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -298,7 +309,7 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Nemohu zapsat do %s" @@ -435,6 +446,8 @@ 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 @@ -531,14 +544,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " správce %s je %s, ne %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s nemá žádnou položku pro override\n" +msgstr " %s nemá žádnou zdrojovou položku pro override\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s nemá žádnou položku pro override\n" +msgstr " %s nemá ani žádnou binární položku pro override\n" #: ftparchive/contents.cc:317 #, c-format @@ -740,119 +753,119 @@ msgstr "%lu k odstranění a %lu neaktualizováno.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Opravuji závislosti..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " selhalo." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Nemohu opravit závislosti" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Nemohu minimalizovat sadu pro aktualizaci" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Hotovo" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Pro opravení můžete spustit `apt-get -f install'." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Nesplněné závislosti. Zkuste použít -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Autentizační varování potlačeno.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Instalovat tyto balíky bez ověření [y/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Některé balíky nemohly být autentizovány" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Vnitřní chyba, třídění nedoběhlo do konce" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Nemohu zamknout adresář pro stahování" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nelze přečíst seznam zdrojů." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Jak podivné... velikosti nesouhlasí, ohlaste to na apt@packages.debian.org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Potřebuji stáhnout %sB/%sB archivů.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Potřebuji stáhnout %sB archivů.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po rozbalení bude na disku použito dalších %sB.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení bude na disku uvolněno %sB.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nemohu určit volné místo v %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "V %s nemáte dostatek volného místa." -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Udáno 'pouze triviální', ovšem toto není triviální operace." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Ano, udělej to tak, jak říkám!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -863,28 +876,28 @@ msgstr "" "Pro pokračování opište frázi '%s'\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Přerušeno." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -892,47 +905,47 @@ msgstr "" "Nemohu stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --" "fix-missing?" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výměna média nejsou momentálně podporovány" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Nemohu opravit chybějící balíky." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Přerušuji instalaci." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Pozn: Vybírám %s místo %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Přeskakuji %s, protože je již nainstalován.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Balík %s není nainstalován, nelze tedy odstranit\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Balík %s je virtuální balík poskytovaný:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr "[Instalovaný]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Měli byste explicitně vybrat jeden k instalaci." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -943,49 +956,49 @@ msgstr "" "To může znamenat že balík chybí, byl zastarán, nebo je dostupný\n" "pouze z jiného zdroje\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Nicméně následující balíky jej nahrazují:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Balík %s nemá kandidáta pro instalaci" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstalace %s není možná, protože nelze stáhnout.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s je již nejnovější verze.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Vydání '%s' pro '%s' nebylo nalezeno" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Verze '%s' pro '%s' nebyla nalezena" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vybraná verze %s (%s) pro %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Nemohu uzamknout list adresář" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -993,26 +1006,26 @@ msgstr "" "Některé indexové soubory se nepodařilo stáhnout, jsou ignorovány, nebo jsou " "použity starší verze." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Vnitřní chyba, řešitel problémů pokazil věci" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" @@ -1544,9 +1557,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Adresáře info a temp musí být na stejném souborovém systému" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Čtu seznamy balíků" @@ -1680,11 +1693,13 @@ msgid "File not found" msgstr "Soubor nebyl nalezen" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: methods/gzip.cc:141 methods/gzip.cc:150 msgid "Failed to stat" msgstr "Selhalo vyhodnocení" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" @@ -1812,7 +1827,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashováním souboru" @@ -1936,86 +1951,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: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: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:375 msgid "Waiting for headers" msgstr "Čekám na hlavičky" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Chybná hlavička" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 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:584 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:599 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:601 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má porouchanou podporu rozsahů" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Čas spojení vypršel" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Špatné datové záhlaví" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Vnitřní chyba" @@ -2028,7 +2043,7 @@ msgstr "Nemohu provést mmap prázdného souboru" msgid "Couldn't make mmap of %lu bytes" msgstr "Nešlo mmapovat %lu bajtů" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Výběr %s nenalezen" @@ -2089,12 +2104,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Hotovo" @@ -2226,108 +2241,110 @@ msgstr "Problém při odstraňování souboru" msgid "Problem syncing the file" msgstr "Problém při synchronizování souboru" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cache balíků je prázdná" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Cache soubor balíků je poškozen" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Cache soubor balíků je v nekompatibilní verzi" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Tento APT nepodporuje systém pro správu verzí '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Cache balíků byla vytvořena pro jinou architekturu" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Závisí na" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Předzávisí na" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Navrhuje" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Doporučuje" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Koliduje s" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Nahrazuje" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Zastarává" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "důležitý" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "vyžadovaný" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standardní" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "volitelný" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Vytvářím strom závislostí" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Kandidátské verze" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Generování závislostí" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Slučuji dostupné informace" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Nelze otevřít %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Selhal zápis souboru %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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 "Nelze zpracovat soubor %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" @@ -2362,7 +2379,7 @@ msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)" msgid "Opening %s" msgstr "Otevírám %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý." @@ -2448,17 +2465,17 @@ msgstr "Ovladač metody %s nemohl být nalezen." msgid "Method %s did not start correctly" msgstr "Metoda %s nebyla spuštěna správně" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Vložte prosím disk nazvaný '%s' do mechaniky '%s' a stiskněte enter." -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Balíčkovací systém '%s' není podporován" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Nebylo možno určit vhodný typ balíčkovacího systému" @@ -2502,92 +2519,109 @@ msgstr "Cache má nekompatibilní systém správy verzí" msgid "Error occurred while processing %s (NewPackage)" msgstr "Při zpracování %s se objevila chyba (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Při zpracování %s se objevila chyba (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Při zpracování %s se objevila chyba (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Při zpracování %s se objevila chyba (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Při zpracování %s se objevila chyba (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Při zpracování %s se objevila chyba (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Při zpracování %s se objevila chyba (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Při zpracování %s se objevila chyba (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Při zpracování %s se objevila chyba (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Wow, překročili jste počet jmen balíků, které tato APT zvládá zpracovat." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wow, překročili jste počet verzí, které tato APT zvládá zpracovat." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Wow, překročili jste počet verzí, které tato APT zvládá zpracovat." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Wow, překročili jste počet závislostí, které tato APT zvládá zpracovat." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Chyba při zpracování %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Při zpracování %s se objevila chyba (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Při zpracování závislostí nebyl nalezen balík %s %s" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "Chyba IO při ukládání zdrojové cache" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format 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:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "Neshoda MD5 součtů" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2596,7 +2630,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:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2605,14 +2639,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:854 +#: apt-pkg/acquire-item.cc:1305 #, 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:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" @@ -2621,7 +2655,7 @@ msgstr "Velikosti nesouhlasí" msgid "Vendor block %s contains no fingerprint" msgstr "Blok výrobce %s neobsahuje otisk klíče" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2630,47 +2664,49 @@ msgstr "" "Používám přípojný bod %s\n" "Připojuji CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Rozpoznávám... " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Uložený název: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Používám přípojný bod %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Odpojuji CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Čekám na disk...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Připojuji CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Hledám na disku indexové soubory...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation 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:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2679,38 +2715,38 @@ msgstr "" "Tento disk se nazývá: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopíruji seznamy balíků..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Zapisuji nový seznam balíků\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Seznamy zdrojů na tomto disku jsou:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Odpojuji CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Zapsal jsem %i záznamů.\n" -#: 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 "Zapsal jsem %i záznamů s chybějícími soubory (%i).\n" -#: 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 "Zapsal jsem %i záznamů s nesouhlasícími soubory (%i).\n" -#: 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 "" @@ -2766,10 +2802,20 @@ msgstr "Připravuji úplné odstranění %s" msgid "Completely removed %s" msgstr "Kompletně odstraněn %s" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Nemohu otevřít soubor %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Spojení bylo předčasně ukončeno" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +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" + #~ msgid "File date has changed %s" #~ msgstr "Datum souboru se změnil %s" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" +"POT-Creation-Date: 2006-08-15 15:55+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" @@ -14,162 +14,172 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 #, fuzzy msgid "Total package names : " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 #, fuzzy msgid " Normal packages: " msgstr " Pecynnau Normal: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 #, fuzzy msgid " Pure virtual packages: " msgstr " Pecynnau Cwbl Rhithwir: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 #, fuzzy msgid " Single virtual packages: " msgstr " Pecynnau Rhithwir Sengl: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 #, fuzzy msgid " Mixed virtual packages: " msgstr " Pecynnau Rhithwir Cymysg: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Ar Goll: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 #, fuzzy msgid "Total distinct versions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Cyfanswm Fersiynau Gwahanol: " + +#: cmdline/apt-cache.cc:295 #, fuzzy msgid "Total dependencies: " msgstr "Cyfanswm Dibyniaethau: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 #, fuzzy msgid "Total ver/file relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " + +#: cmdline/apt-cache.cc:302 #, fuzzy msgid "Total Provides mappings: " msgstr "Cyfanswm Mapiau Darpariath: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 #, fuzzy msgid "Total globbed strings: " msgstr "Cyfanswm Llinynau Glob: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 #, fuzzy msgid "Total dependency version space: " msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 #, fuzzy msgid "Total slack space: " msgstr "Cyfanswm gofod Slac: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 #, fuzzy msgid "Total space accounted for: " msgstr "Cyfanswm Gofod Cyfrifwyd: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Rhaid i chi ddarparu un patrwm yn union" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Canfuwyd dim pecyn" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 #, fuzzy msgid "Package files:" msgstr "Ffeiliau Pecynnau:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 #, fuzzy msgid "Pinned packages:" msgstr "Pecynnau wedi eu Pinio:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(heb ganfod)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(dim)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 #, fuzzy msgid " Package pin: " msgstr " Pin Pecyn: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 #, fuzzy msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -324,7 +334,7 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Ni ellir ysgrifennu i %s" @@ -776,122 +786,122 @@ msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Yn cywiro dibyniaethau..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " wedi methu." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Ni ellir cywiro dibyniaethau" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Ni ellir bychanu y set uwchraddio" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Wedi Gorffen" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 #, fuzzy msgid "Some packages could not be authenticated" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Mae problemau a defnyddwyd -y heb --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 #, fuzzy msgid "Packages need to be removed but remove is disabled." msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Methwyd darllen y rhestr ffynhonellau." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Mae angen cyrchu %sB o archifau.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Does dim digon o le rhydd gennych yn %s." -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -902,29 +912,29 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Erthylu." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -932,49 +942,49 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 #, fuzzy msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Sefydliwyd]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Dylech ddewis un yn benodol i'w sefydlu." # FIXME: punctuation -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, fuzzy, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -986,49 +996,49 @@ msgstr "" "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" "ffeil sources.list.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1036,26 +1046,26 @@ msgstr "" "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " "rai eu defnyddio yn lle." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 #, fuzzy msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" @@ -1610,9 +1620,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 #, fuzzy msgid "Reading package lists" msgstr "Yn Darllen Rhestrau Pecynnau" @@ -1760,11 +1770,13 @@ msgid "File not found" msgstr "Ffeil heb ei ganfod" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: methods/gzip.cc:141 methods/gzip.cc:150 msgid "Failed to stat" msgstr "Methwyd stat()" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -1895,7 +1907,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" @@ -2018,92 +2030,92 @@ msgid "" "available:\n" msgstr "" -#: methods/gzip.cc:57 +#: 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: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:375 msgid "Waiting for headers" msgstr "Yn aros am benawdau" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Llinell pennawd gwael" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 #, 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:584 #, 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:599 #, 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:601 #, 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:625 msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:874 +#: methods/http.cc:873 #, 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:875 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:1107 +#: methods/http.cc:1106 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Gwall mewnol" @@ -2116,7 +2128,7 @@ msgstr "Ni ellir defnyddio mmap() ar ffeil gwag" msgid "Couldn't make mmap of %lu bytes" msgstr "Methwyd gwneud mmap() efo %lu beit" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" @@ -2178,12 +2190,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Wedi Gorffen" @@ -2319,113 +2331,115 @@ msgstr "Gwall wrth dadgysylltu'r ffeil" msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Storfa pecyn gwag" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Mae'r ffeil storfa pecyn yn llygredig" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" # FIXME: capitalisation? -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, fuzzy, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Dibynnu" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "CynDdibynnu" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Awgrymu" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Argymell" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Gwrthdaro" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Amnewid" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Darfodi" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "pwysig" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "angenrheidiol" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "safonnol" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opsiynnol" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "ychwanegol" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 #, fuzzy msgid "Building dependency tree" msgstr "Yn Aideladu Coeden Dibyniaeth" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 #, fuzzy msgid "Candidate versions" msgstr "Fersiynau Posib" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 #, fuzzy msgid "Dependency generation" msgstr "Cynhyrchaid Dibyniaeth" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Yn cyfuno manylion Ar Gael" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Methwyd agor %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Methwyd ysgrifennu ffeil %s" # FIXME: number? -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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 "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" @@ -2461,7 +2475,7 @@ msgstr "" msgid "Opening %s" msgstr "Yn agor %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." @@ -2551,7 +2565,7 @@ msgstr "Methwyd canfod y gyrrydd dull %s." msgid "Method %s did not start correctly" msgstr "Ni gychwynodd y dull %s yn gywir" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2559,12 +2573,12 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Ni chynhelir y system pecynnu '%s'" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 #, fuzzy msgid "Unable to determine a suitable packaging system type" msgstr "Ni ellir canfod math system addas" @@ -2611,93 +2625,109 @@ msgstr "Mae can y storfa system fersiwn anghyfaddas" msgid "Error occurred while processing %s (NewPackage)" msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Yn Casglu Darpariaethau Ffeil" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 msgid "There are no public key available for the following key IDs:\n" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2706,7 +2736,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:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2715,14 +2745,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:854 +#: apt-pkg/acquire-item.cc:1305 #, 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:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" @@ -2731,95 +2761,97 @@ msgstr "Camgyfatebiaeth maint" msgid "Vendor block %s contains no fingerprint" msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 #, fuzzy msgid "Waiting for disc...\n" msgstr "Yn aros am benawdau" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:673 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 #, fuzzy msgid "Copying package lists..." msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 #, 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:792 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "" -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -2874,10 +2906,19 @@ msgstr "Yn agor y ffeil cyfluniad %s" msgid "Completely removed %s" msgstr "Methwyd dileu %s" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Methwyd agor ffeil %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" +#: apt-pkg/acquire-item.cc:1097 +msgid "There is no public key available for the following key IDs:\n" +msgstr "" + #~ msgid "File date has changed %s" #~ msgstr "Dyddiad ffeil wedi newid %s" @@ -4,161 +4,172 @@ # Danish messages # # Claus Hindsgaul <claus_h@image.dk>, 2002,2003, 2004, 2005, 2006. +# Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2006. msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23: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: 2006-08-15 15:55+0200\n" +"PO-Revision-Date: 2006-10-06 15:57+0200\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 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakken %s version %s har en uopfyldt afhngighed:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Kunne ikke lokalisere pakken %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Totale pakkenavne : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Normale pakker: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Rene virtuelle pakker: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Enkelte virtuelle pakker: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Blandede virtuelle pakker: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Manglende: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Totale forskellige versioner: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Totale forskellige versioner: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Totale afhngigheder: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Totale version/fil-relationer: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Totale version/fil-relationer: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Totale 'tilbyder'-markeringer: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Totalle sgemnsterstrenge: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Total afhngighedsversions-plads: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Total 'Slack'-plads: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Total plads, der kan gres rede for: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Pakkefilen %s er ude af trit." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Du skal angive njagtig t mnster" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Fandt ingen pakker" # Overskriften til apt-cache policy, # forkorter "Package" vk. CH -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Pakkefiler:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Mellemlageret er ude af trit, kan ikke krydsreferere en pakkefil" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "'Pinned' pakker:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(ikke fundet)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Installeret: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(ingen)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Pakke-pin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Versionstabel:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s oversat p %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -305,7 +316,7 @@ msgstr "" " -c=? Ls denne opstningsfil\n" " -o=? Angiv et opstningstilvalg. F.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Kunne ikke skrive til %s" @@ -442,6 +453,8 @@ 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 @@ -538,14 +551,15 @@ msgid " %s maintainer is %s not %s\n" msgstr " pakkeansvarlig for %s er %s, ikke %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s har ingen tvangs-post\n" +msgstr " %s har ingen linje med tilsidesttelse af standard for kildefiler\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s har ingen tvangs-post\n" +msgstr "" +" %s har ingen linje med tilsidesttelse af standard for binre filer\n" #: ftparchive/contents.cc:317 #, c-format @@ -747,118 +761,118 @@ msgstr "%lu afinstalleres og %lu opgraderes ikke.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu ikke fuldstndigt installerede eller afinstallerede.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Retter afhngigheder..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " mislykkedes." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Kunne ikke rette afhngigheder" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Kunne ikke minimere opgraderingssttet" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Frdig" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Du kan muligvis rette dette ved at kre 'apt-get -f install'." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Uopfyldte afhngigheder. Prv med -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Flgende pakkers autensitet kunne ikke verificeres!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Autentifikationsadvarsel tilsidesat.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Installr disse pakker uden verifikation (y/N)? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Nogle pakker kunne ikke autentificeres" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Der er problemer og -y blev brugt uden --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Intern fejl. InstallPackages blev kaldt med delagte pakker!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Intern fejl. Sortering blev ikke fuldfrt" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Kunne ikke lse nedhentningsmappen" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Listen med kilder kunne ikke lses." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Mystisk.. Strrelserne passede ikke, skriv til apt@packages.debian.org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%sB/%sB skal hentes fra arkiverne.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB skal hentes fra arkiverne.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Efter udpakning vil %sB yderligere diskplads vre brugt.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, 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:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Ja, gr som jeg siger!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -869,28 +883,28 @@ msgstr "" "For at fortstte, skal du skrive '%s'\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Afbryder." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortstte [J/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -898,49 +912,49 @@ msgstr "" "Kunne ikke hente nogle af arkiverne. Prv evt. at kre 'apt-get update' " "eller prv med --fix-missing." -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og medieskift understttes endnu ikke" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Kunne ikke rette manglende pakker." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Afbryder installationen." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Bemrk, at %s vlges fremfor %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Overspringer %s, da den allerede er installeret og opgradering er " "deaktiveret.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikke installeret, s den afinstalleres ikke\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er en virtuel pakke, der kan leveres af:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Installeret]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Du br eksplicit vlge en at installere." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -951,49 +965,49 @@ msgstr "" "anden pakke. Det kan betyde at denne pakke blevet overfldiggjort eller \n" "kun kan hentes fra andre kilder\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Dog kan flgende pakker erstatte den:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakken %s har ingen installationskandidat" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s er i forvejen den nyeste version.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Udgaven '%s' for '%s' blev ikke fundet" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versionen '%s' for '%s' blev ikke fundet" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Valgte version %s (%s) af %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "'update'-kommandoen benytter ingen parametre" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Kunne ikke lse listemappen" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1001,26 +1015,26 @@ msgstr "" "Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle " "bruges i stedet." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern fejl. Problemlseren delagde noget" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern fejl, AllUpgrade delagde noget" @@ -1557,9 +1571,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Mapperne info og temp skal ligge i samme filsystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Indlser pakkelisterne" @@ -1694,11 +1708,13 @@ msgid "File not found" msgstr "Fil blev ikke fundet" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: methods/gzip.cc:141 methods/gzip.cc:150 msgid "Failed to stat" msgstr "Kunne ikke finde" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Kunne ikke angive ndringstidspunkt" @@ -1826,7 +1842,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" @@ -1911,9 +1927,9 @@ msgid "Unable to connect to %s %s:" msgstr "Kunne ikke forbinde til %s %s:" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Kunne ikke omstte navnet '%s'" +msgstr "Kunne ikke tilg ngleringent '%s'" #: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." @@ -1930,9 +1946,10 @@ msgid "At least one invalid signature was encountered." msgstr "Stdte p mindst n ugyldig signatur." #: methods/gpgv.cc:213 -#, fuzzy, c-format +#, 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:218 msgid "Unknown error executing gpgv" @@ -1950,87 +1967,87 @@ msgstr "" "Flgende signaturer kunne ikke verificeret, da den offentlige ngle ikke er " "tilgngelig:\n" -#: methods/gzip.cc:57 +#: 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: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:375 msgid "Waiting for headers" msgstr "Afventer hoveder" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Ugyldig linje i hovedet" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "http-serveren sendte et ugyldigt svarhovede" -#: methods/http.cc:585 +#: methods/http.cc:584 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:599 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:601 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:625 msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Tidsudlb p forbindelsen" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Fejl ved lsning fra server" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Intern fejl" @@ -2043,7 +2060,7 @@ msgstr "Kan ikke udfre mmap for en tom fil" msgid "Couldn't make mmap of %lu bytes" msgstr "Kunne ikke udfre mmap for %lu byte" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Det valgte %s blev ikke fundet" @@ -2103,12 +2120,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Frdig" @@ -2240,108 +2257,110 @@ msgstr "Fejl ved frigivelse af filen" msgid "Problem syncing the file" msgstr "Problem under synkronisering af fil" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Tomt pakke-mellemlager" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Pakke-mellemlagerets fil er delagt" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Pakke-mellemlagerets fil er af en inkompatibel version" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Denne APT understtter ikke versionssystemet '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Pakke-mellemlageret er lavet til en anden arkitektur" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Afhngigheder" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Pr-afhngigheder" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Foreslede" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Anbefalede" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Konflikter" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Erstatter" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Overfldiggr" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "vigtig" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "krvet" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "frivillig" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "ekstra" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Opbygger afhngighedstr" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Kandidatversioner" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Afhngighedsgenerering" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Sammenfletter tilgngelighedsoplysninger" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Kunne ikke bne %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Kunne ikke skrive filen %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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 "Kunne ikke tolke pakkefilen %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kunne ikke tolke pakkefilen %s (2)" @@ -2376,7 +2395,7 @@ msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)" msgid "Opening %s" msgstr "bner %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Linjen %u er for lang i kildelisten %s." @@ -2446,14 +2465,14 @@ msgstr "Arkivmappen %spartial mangler." #. 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 "Henter fil %li ud af %li (%s tilbage)" #: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#, 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 @@ -2465,17 +2484,17 @@ msgstr "Metodedriveren %s blev ikke fundet." msgid "Method %s did not start correctly" msgstr "Metoden %s startede ikke korrekt" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Indst disken med navnet: '%s' i drevet '%s' og tryk retur." -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet '%s' understttes ikke" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Kunne ikke bestemme en passende pakkesystemtype" @@ -2518,93 +2537,110 @@ msgstr "Mellemlageret benytter en inkompatibel versionsstyring" msgid "Error occurred while processing %s (NewPackage)" msgstr "Der skete en fejl under behandlingen af %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Hold da op! Du nede over det antal pakkenavne, denne APT kan hndtere." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Hold da op! Du nede over det antal versioner, denne APT kan hndtere." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Hold da op! Du nede over det antal versioner, denne APT kan hndtere." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Hold da op! Du nede over det antal afhngigheder, denne APT kan hndtere." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Der skete en fejl under behandlingen af %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhngigheder" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunne ikke finde kildepakkelisten %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Samler filudbud" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "IO-fejl ved gemning af kilde-mellemlageret" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "omdbning mislykkedes, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" msgstr "" "Der er ingen tilgngelige offentlige ngler for flgende ngle-ID'er:\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2613,7 +2649,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:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2622,13 +2658,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:854 +#: apt-pkg/acquire-item.cc:1305 #, 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:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Strrelsen stemmer ikke" @@ -2637,7 +2673,7 @@ msgstr "Strrelsen stemmer ikke" msgid "Vendor block %s contains no fingerprint" msgstr "Leverandrblok %s inderholder intet fingeraftryk" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2646,47 +2682,49 @@ msgstr "" "Bruger cdrom-monteringspunktet %s\n" "Monterer cdrom\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Identificerer.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Gemt mrkat: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Bruger cdrom-monteringspunktet %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Afmonterer cdrom\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Venter p disken...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Monterer cdrom...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Skanner disken for indeksfiler..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Fandt %i pakkeindekser, %i kildeindekser og %i signaturer\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2695,38 +2733,38 @@ msgstr "" "Denne disk hedder: \n" " %s \n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopierer pakkelisterne..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Skriver ny kildeliste\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Denne disk har flgende kildeliste-indgange:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Afmonterer cdrom..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: 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 "Skrev %i poster med %i manglende filer.\n" -#: 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 "Skrev %i poster med %i ikke-trufne filer\n" -#: 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 "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n" @@ -2772,19 +2810,29 @@ 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/rred.cc:219 +msgid "Could not patch file" +msgstr "Kunne ikke pfre filen %s en lap" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Forbindelsen lukkedes for hurtigt" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +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" + #~ msgid "File date has changed %s" #~ msgstr "Filens dato er ndret %s" @@ -1,159 +1,169 @@ -# 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-08-09 23:46+0200\n" -"PO-Revision-Date: 2005-06-15 18:22+0200\n" +"POT-Creation-Date: 2006-08-15 15:55+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paket %s Version %s hat eine nichterfüllte Abhängigkeit:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Kann Paket %s nicht finden" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Gesamtzahl an Paketnamen: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " davon gewöhnliche Pakete: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " davon rein virtuelle Pakete: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " davon einzelne virtuelle Pakete: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " davon gemischte virtuelle Pakete: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " davon fehlend: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Gesamtzahl an unterschiedlichen Versionen: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Gesamtzahl an unterschiedlichen Versionen: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Gesamtzahl an Abhängigkeiten: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Gesamtzahl an Version/Datei-Beziehungen: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Gesamtzahl an Version/Datei-Beziehungen: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Gesamtzahl an Bereitstellungen: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Gesamtzahl an Mustern: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Gesamtmenge an Abhängigkeits/Versionsspeicher: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Gesamtmenge an Slack: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Gesamtmenge an Speicher: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Paketdatei %s ist nicht synchronisiert." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Sie müssen genau ein Muster angeben" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Keine Pakete gefunden" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Paketdateien:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache ist nicht sychron, kann eine Paketdatei nicht querverweisen" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" -msgstr "Festgehaltene Pakete (»Pin«):" +msgstr "Festgehaltene Pakete („Pin“):" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(nicht gefunden)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Installiert:" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(keine)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Mögliche Pakete:" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Paketstecknadel: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Versions-Tabelle:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s für %s %s kompiliert am %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -200,29 +210,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 +241,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 +251,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 +279,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" @@ -308,7 +319,7 @@ msgstr "" " -o=? Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Kann nicht nach %s schreiben" @@ -342,7 +353,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 +408,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 +420,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 +429,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,7 +446,7 @@ 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:47 #, c-format @@ -453,6 +463,8 @@ 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 @@ -467,7 +479,7 @@ msgstr "Kann auf %s nicht zugreifen." #: 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:448 msgid "Unable to get a cursor" @@ -522,7 +534,7 @@ msgstr "Kann kein readlink auf %s durchführen" #: 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:276 #, c-format @@ -549,14 +561,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " %s-Maintainer ist %s und nicht %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s hat keinen Eintrag in der Override-Liste.\n" +msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s hat keinen Eintrag in der Override-Liste.\n" +msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n" #: ftparchive/contents.cc:317 #, c-format @@ -565,7 +577,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 @@ -585,7 +597,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 @@ -595,7 +607,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 @@ -660,7 +672,7 @@ msgstr "J" #: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574 #, 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:238 msgid "The following packages have unmet dependencies:" @@ -726,7 +738,6 @@ msgid "%s (due to %s) " msgstr "%s (wegen %s) " #: cmdline/apt-get.cc:547 -#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -759,203 +770,201 @@ msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu nicht vollständig installiert oder entfernt.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Abhängigkeit werden korrigiert..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " fehlgeschlagen." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Kann Abhängigkeiten nicht korrigieren" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Kann die Menge zu erneuernder Pakete nicht minimieren" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Fertig" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 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:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Nichterfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Authentifizierungswarnung überstimmt.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Diese Pakete ohne Überprüfung installieren [j/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Einige Pakete konnten nicht authentifiziert werden" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Interner Fehler, InstallPackages mit kaputten Pakete aufgerufen!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Interner Fehler, Anordnung beendete nicht" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Kann kein Lock für das Downloadverzeichnis erhalten." -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Die Liste der Quellen konnte nicht gelesen werden." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Wie merkwürdig... Die Größen haben nicht übereingestimmt, schreiben Sie an " "apt@packages.debian.org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Es müssen noch %sB von %sB Archiven geholt werden.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Es müssen %sB Archive geholt werden.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Nach dem Auspacken werden %sB Plattenplatz zusätzlich benutzt.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben worden sein.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "Konnte freien Platz in %s nicht bestimmen" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Sie haben nicht genug Platz in %s." -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "»Nur triviale« angegeben, aber das ist keine triviale Operation." +msgstr "„Nur triviale“ angegeben, aber das ist keine triviale Operation." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Ja, tu was ich sage!" -#: cmdline/apt-get.cc:869 -#, fuzzy, c-format +#: cmdline/apt-get.cc:883 +#, 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:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Abbruch." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Konnte %s nicht holen %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"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:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing und Wechselmedien werden zurzeit nicht unterstützt" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Konnte fehlende Pakete nicht korrigieren." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Installation abgebrochen." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Achtung, wähle %s an Stelle von %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -"Ü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:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, 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:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Installiert]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Sie sollten eines explizit zum Installieren auswählen." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -966,51 +975,51 @@ msgstr "" "Paket referenziert. Das kann heißen, dass das Paket fehlt, dass es veraltet\n" "ist oder nur aus einer anderen Quelle verfügbar ist.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Doch die folgenden Pakete ersetzen es:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Paket %s hat keinen Installationskandidaten" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Re-Installation von %s ist nicht möglich,\n" "es kann nicht heruntergeladen werden.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ist schon die neueste Version.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, 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:1173 +#: cmdline/apt-get.cc:1187 #, 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:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Gewählte Version %s (%s) für %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 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:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Kann kein Lock auf das Listenverzeichnis bekommen" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1018,27 +1027,27 @@ msgstr "" "Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden " "ignoriert oder alte an ihrer Stelle benutzt." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "" "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" @@ -1050,20 +1059,18 @@ msgstr "Konnte Paket %s nicht finden" #: cmdline/apt-get.cc:1584 #, 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:1614 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:1617 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:1629 @@ -1075,7 +1082,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:1637 @@ -1084,7 +1091,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." @@ -1124,7 +1131,7 @@ msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" #: cmdline/apt-get.cc:1969 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:1999 cmdline/apt-get.cc:2228 @@ -1133,9 +1140,9 @@ msgid "Unable to find a source package for %s" msgstr "Kann Quellpaket für %s nicht finden" #: cmdline/apt-get.cc:2043 -#, fuzzy, c-format +#, 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:2067 #, c-format @@ -1169,17 +1176,17 @@ msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n" #: cmdline/apt-get.cc:2152 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n" +msgstr "Entpack-Befehl „%s“ fehlgeschlagen.\n" #: cmdline/apt-get.cc:2153 #, 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:2170 #, c-format msgid "Build command '%s' failed.\n" -msgstr "Build-Befehl »%s« fehlgeschlagen.\n" +msgstr "Build-Befehl „%s“ fehlgeschlagen.\n" #: cmdline/apt-get.cc:2189 msgid "Child process failed" @@ -1234,11 +1241,11 @@ msgstr "Konnte die %s-Abhängigkeit für %s nicht erfüllen: %s" #: cmdline/apt-get.cc:2431 #, 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:2435 msgid "Failed to process build dependencies" -msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen" +msgstr "Verarbeitung der Build-Abhängigkeiten fehlgeschlagen" #: cmdline/apt-get.cc:2467 msgid "Supported modules:" @@ -1294,35 +1301,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" @@ -1359,13 +1367,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 "" @@ -1459,7 +1467,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" @@ -1467,11 +1475,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!" @@ -1483,7 +1491,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 @@ -1501,9 +1509,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 @@ -1587,12 +1595,12 @@ 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:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Paketlisten werden gelesen" @@ -1606,7 +1614,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" @@ -1618,14 +1625,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" @@ -1657,12 +1664,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 @@ -1672,12 +1679,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 @@ -1706,7 +1713,7 @@ 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 @@ -1721,21 +1728,22 @@ msgstr "" "verwendet." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "Datei nicht gefunden" +msgstr "Disk nicht gefunden." #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Datei nicht gefunden" -# looks like someone hardcoded English grammar
+# looks like someone hardcoded English grammar #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: methods/gzip.cc:141 methods/gzip.cc:150 msgid "Failed to stat" msgstr "Kann nicht zugreifen." #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Kann Änderungszeitpunkt nicht setzen" @@ -1776,13 +1784,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 @@ -1864,14 +1872,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:957 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" @@ -1880,7 +1888,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 @@ -1932,17 +1940,17 @@ 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 @@ -1950,125 +1958,131 @@ msgid "Unable to connect to %s %s:" msgstr "Kann nicht mit %s:%s verbinden:" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, 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: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: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:209 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "Mindestens eine ungültige Signatur wurde entdeckt." #: 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:218 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Unbekannter Fehler beim Ausführen von gpgv" #: methods/gpgv.cc:249 -#, fuzzy 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: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: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: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:375 msgid "Waiting for headers" msgstr "Warte auf Kopfzeilen (header)" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Schlechte Kopfzeile" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 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:584 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:599 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:601 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:625 msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Verbindung erlitt Zeitüberschreitung" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Fehler beim Schreiben einer Ausgabedatei" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Fehler beim Schreiben einer Datei" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Interner Fehler" @@ -2081,7 +2095,7 @@ msgstr "Kann eine leere Datei nicht mit mmap abbilden" msgid "Couldn't make mmap of %lu bytes" msgstr "Konnte kein mmap von %lu Bytes durchführen" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Auswahl %s nicht gefunden" @@ -2089,7 +2103,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 @@ -2135,19 +2149,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fertig" @@ -2155,7 +2169,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 @@ -2181,17 +2195,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 @@ -2273,114 +2288,116 @@ 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" msgstr "Beim Synchronisieren einer Datei trat ein Problem auf" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Leerer Paketcache" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Die Paketcachedatei ist korrumpiert" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 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 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, 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 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Der Paketcache wurde für eine andere Architektur aufgebaut" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Hängt ab" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Hängt ab (vorher)" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Schlägt vor" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Empfiehlt" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Kollidiert" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Ersetzt" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Veraltet" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "wichtig" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "erforderlich" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "optional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Abhängigkeitsbaum wird aufgebaut" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Mögliche Versionen" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Abhängigkeits-Generierung" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Führe Information zur Verfügbarkeit zusammen" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Konnte %s nicht öffnen" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" -msgstr "Konnte nicht in Datei %s schreiben" +msgstr "Konnte Datei %s nicht schreiben" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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 "Kann Paketdatei %s nicht parsen (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kann Paketdatei %s nicht parsen (2)" @@ -2388,34 +2405,34 @@ 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 msgid "Opening %s" msgstr "%s wird geöffnet" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Zeile %u zu lang in der Quellliste %s." @@ -2423,17 +2440,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 @@ -2450,7 +2467,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:245 #, c-format @@ -2487,13 +2504,12 @@ msgstr "Archivverzeichnis %spartial fehlt." #: apt-pkg/acquire.cc:823 #, 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 +#, 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 @@ -2505,20 +2521,19 @@ msgstr "Der Treiber für Methode %s konnte nicht gefunden werden." msgid "Method %s did not start correctly" msgstr "Methode %s hat nicht korrekt gestartet" -#: apt-pkg/acquire-worker.cc:384 -#, fuzzy, c-format +#: apt-pkg/acquire-worker.cc:377 +#, 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:122 +#: apt-pkg/init.cc:125 #, 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:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen" @@ -2530,7 +2545,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 @@ -2541,17 +2556,16 @@ 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 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 #, 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 msgid "No priority (or zero) specified for pin" @@ -2566,96 +2580,116 @@ msgstr "Dieser Paketcache wurde für ein inkompatibles Versionssystem aufgebaut" msgid "Error occurred while processing %s (NewPackage)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Toll, Sie haben die Anzahl an Paketen überschritten, die APT handhaben kann." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Toll, Sie haben die Anzahl an Versionen überschritten, die APT handhaben " "kann." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Toll, Sie haben die Anzahl an Versionen überschritten, die APT handhaben " +"kann." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Toll, Sie haben die Anzahl an Abhängigkeiten überschritten, die APT " "handhaben kann." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Fehler trat beim Bearbeiten von %s auf (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Fehler trat beim Bearbeiten von %s auf (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Paket %s %s wurde nicht gefunden beim Verarbeiten der Dateiabhängigkeiten" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kann nicht auf die Liste %s der Quellpakete zugreifen." -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Sammle Datei-Empfehlungen ein" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "E/A-Fehler beim Sichern des Quellcaches" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "MD5-Summe stimmt nicht" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are 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:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2664,7 +2698,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:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2673,14 +2707,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:854 +#: apt-pkg/acquire-item.cc:1305 #, 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:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Größe stimmt nicht" @@ -2689,96 +2723,98 @@ msgstr "Größe stimmt nicht" msgid "Vendor block %s contains no fingerprint" msgstr "Herstellerblock %s enthält keinen Fingerabdruck" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" "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 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Identifiziere... " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Gespeicherte Kennzeichnung: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Benutze CD-ROM-Einhängpunkt %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Hänge CD-ROM aus\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Warte auf CD...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Hänge CD-ROM ein...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Suche auf CD nach Index-Dateien...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Fand %i Paketindexe, %i Quellenindexe und %i Signaturen\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 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:753 #, 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:757 msgid "Copying package lists..." msgstr "Kopiere Paketlisten..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Schreibe neue Quellliste\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Quelllisteneinträge für diese CD sind:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Hänge CD-ROM aus..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Es wurden %i Datensätze geschrieben.\n" -#: 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 "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n" -#: 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 "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n" -#: 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 "" @@ -2786,309 +2822,66 @@ 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/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Konnte Datei %s nicht öffnen" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Verbindung zu früh beendet" -#~ msgid "File date has changed %s" -#~ msgstr "Dateidatum hat sich geändert %s" - -#~ msgid "Reading file list" -#~ msgstr "Paketlisten werden gelesen" - +#: apt-pkg/acquire-item.cc:1097 #, 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«" +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" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-27 13:46+0200\n" -"PO-Revision-Date: 2006-06-20 12:50+0530\n" +"POT-Creation-Date: 2006-09-12 11:18+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" "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: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" @@ -432,115 +432,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.རྒསཔ་ལུ་ཡིག་སྣོད་འདི་བསྐྱར་མིང་བཏགས་ཡི།" -#: 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 "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་དྲན་ཐོ་མིན་འདུག" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "འོད་རྟགས་ལེན་མ་ཚུགས།" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "ཌབ་ལུ:%sསྣོད་ཐོ་འདི་ལྷག་མ་ཚུགས།\n" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "ཌབ་ལུ་ %s སིཊེཊི་འབད་མ་ཚུགས།\n" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "ཨི:" -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "ཌབ་ལུ:" -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "ཨི:འཛོལ་བ་ཚུ་ཡིག་སྣོད་ལུ་འཇུག་སྤྱོད་འབད།" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "%s་མོས་མཐུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "རྩ་འབྲེལ་ཕྱིར་བགྲོད་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " 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 +#, 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" @@ -803,11 +816,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 "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།" @@ -838,7 +851,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་ནང་བར་སྟོང་" @@ -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་ ལེན་ནི་ལུ་འཐུས་ཤོར་བ 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 "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།" @@ -1057,114 +1070,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 " @@ -1173,32 +1186,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" @@ -1387,19 +1400,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 "མ་ཤེས་པའི་ ཊཱར་་མགོ་ཡིག་་དབྱེ་བ་ %u་ འཐུས་མི་ %s།" @@ -1679,12 +1692,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:134 +#: methods/gzip.cc:143 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:140 msgid "Failed to set modification time" msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -1896,44 +1909,44 @@ 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: Acquire::gpgv::Options་ནང་ལས་ཀྱི་སྒྲུབ་རྟགས་ཀྱི་ཐོ་ཡིག་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག ཕྱིར་" "འཐོན་དོ།" -#: methods/gpgv.cc:198 +#: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་ འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་" "མ་ཚུགས?!" -#: methods/gpgv.cc:203 +#: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།" -#: methods/gpgv.cc:207 +#: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" "མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gnupg་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་" "ན།?)" -#: methods/gpgv.cc:212 +#: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།" -#: methods/gpgv.cc:243 +#: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2311,12 +2324,12 @@ msgstr "མི་ངོ་འཐོན་རིམཚུ།" msgid "Dependency generation" msgstr "བརྟེན་པའི་བཟོ་བཏོན།" -#: apt-pkg/tagfile.cc:72 +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 #, c-format msgid "Unable to parse package file %s (1)" msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:186 #, c-format msgid "Unable to parse package file %s (2)" msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" @@ -2574,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 @@ -2760,3 +2773,7 @@ msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བས #: methods/rsh.cc:330 msgid "Connection closed prematurely" 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-08-09 23:46+0200\n" +"POT-Creation-Date: 2006-08-15 15:55+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" @@ -29,146 +29,156 @@ msgstr "" "X-Generator: KBabel 1.10.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, 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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Αδυναμία εντοπισμού του πακέτου %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Συνολικά Ονόματα Πακέτων : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Κανονικά Πακέτα: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Πλήρως Εικονικά Πακέτα: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Μονά Εικονικά Πακέτα: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Μικτά Εικονικά Πακέτα: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr "Αγνοούμενα: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Σύνολο Διαφορετικών Εκδόσεων: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Σύνολο Διαφορετικών Εκδόσεων: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Σύνολο Εξαρτήσεων: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Σύνολο Αντιστοιχίσεων Παροχών: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Σύνολο Κοινών Στοιχειοσειρών : " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Συνολικός χώρος Εξαρτήσεων Εκδόσεων: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Σύνολο χώρου ασφαλείας: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Συνολικός Καταμετρημένος Χώρος: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμένο." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Πρέπει να δώσετε ακριβώς μία παράσταση" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Δε βρέθηκαν πακέτα" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Αρχεία Πακέτου:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Η cache δεν είναι ενημερωμένη, αδυναμία παραπομπής σε ένα αρχείο πακέτου" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Καθηλωμένα Πακέτα:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(δε βρέθηκαν)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Εγκατεστημένα: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(κανένα)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Υποψήφιο: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Καθήλωση Πακέτου: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Πίνακας Έκδοσης:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s για %s %s είναι μεταγλωττισμένο σε %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -318,7 +328,7 @@ msgstr "" " -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" " -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Αδύνατη η εγγραφή στο %s" @@ -764,123 +774,123 @@ msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζοντ msgid "%lu not fully installed or removed.\n" msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Διόρθωση εξαρτήσεων..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " απέτυχε." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Αδύνατη η διόρθωση των εξαρτήσεων" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Ετοιμο" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα " "προβλήματα." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση [ν/Ο]; " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Υπάρχουν προβλήματα και δώσατε -y χωρίς το --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "" "Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Αδύνατη η ανάγνωση της λίστας πηγών." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Πολύ περίεργο! Τα μεγέθη δεν ταιριάζουν, στείλτε μήνυμα στο apt@packages." "debian.org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB από αρχεία.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB από αρχεία.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Μετά την αποσυμπίεση θα χρησιμοποιηθούν %sB χώρου από το δίσκο.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Μετά την αποσυμπίεση θα ελευθερωθούν %sB χώρου από το δίσκο.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s." -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία" -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Ναι, κανε ότι λέω!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -891,28 +901,28 @@ msgstr "" "Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Εγκατάλειψη." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -920,49 +930,49 @@ msgstr "" "Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update " "ή το --fix-missing;" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Αδύνατη η επίλυση των χαμένων πακέτων." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Εγκατάλειψη της εγκατάστασης." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Το πακέτο %s είναι εικονικό και παρέχεται από τα:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Εγκατεστημένα]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Θα πρέπει επακριβώς να επιλέξετε ένα για εγκατάσταση." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -974,51 +984,51 @@ msgstr "" "Αυτό σημαίνει ότι το πακέτο αυτό λείπει, είναι παλαιωμένο, ή είναι διαθέσιμο " "από άλλη πηγή\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Πάραυτα το ακόλουθο πακέτο το αντικαθιστά:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Το πακέτο %s δεν είναι υποψήφιο για εγκατάσταση" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή " "του\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Η έκδοση %s για το%s δεν βρέθηκε" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Η έκδοση %s για το %s δεν βρέθηκε" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Η εντολή update δεν παίρνει ορίσματα" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1026,28 +1036,28 @@ msgstr "" "Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα " "στη θέση τους." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "" "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο " "υλικό" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε" @@ -1591,9 +1601,9 @@ 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:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Ανάγνωση Λιστών Πακέτων" @@ -1727,11 +1737,13 @@ msgid "File not found" msgstr "Το αρχείο Δε Βρέθηκε" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: 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/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης" @@ -1859,7 +1871,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Πρόβλημα κατά το hashing του αρχείου" @@ -1984,87 +1996,87 @@ msgstr "" "Οι παρακάτω υπογραφές δεν ήταν δυνατόν να επαληθευτούν επειδή δεν ήταν " "διαθέσιμο το δημόσιο κλειδί:\n" -#: methods/gzip.cc:57 +#: 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:102 methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s" -#: methods/http.cc:376 +#: methods/http.cc:375 msgid "Waiting for headers" msgstr "Αναμονή επικεφαλίδων" -#: methods/http.cc:522 +#: methods/http.cc:521 #, c-format msgid "Got a single header line over %u chars" msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες" -#: methods/http.cc:530 +#: methods/http.cc:529 msgid "Bad header line" msgstr "Ελαττωματική γραμμή επικεφαλίδας" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης" -#: methods/http.cc:585 +#: methods/http.cc:584 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length" -#: methods/http.cc:600 +#: methods/http.cc:599 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range" -#: methods/http.cc:602 +#: methods/http.cc:601 msgid "This HTTP server has broken range support" msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "Άγνωστη μορφή ημερομηνίας" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Η επιλογή απέτυχε" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:874 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση" -#: methods/http.cc:876 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Η σύνδεση απέτυχε" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" @@ -2077,7 +2089,7 @@ msgstr "Αδύνατο η απεικόνιση mmap ενός άδειου αρχ msgid "Couldn't make mmap of %lu bytes" msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Η επιλογή %s δε βρέθηκε" @@ -2138,12 +2150,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Ολοκληρώθηκε" @@ -2279,108 +2291,110 @@ msgstr "Πρόβλημα κατά την διαγραφή του αρχείου" msgid "Problem syncing the file" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Άδειο cache πακέτων" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Το αρχείο cache των πακέτων είναι ασύμβατης έκδοσης" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Αυτό το APT δεν υποστηρίζει το Σύστημα Απόδοσης Έκδοσης '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Η cache πακέτων κατασκευάστηκε για μια διαφορετική αρχιτεκτονική" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Εξαρτάται από" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "ΠροΕξαρτάται από" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Προτείνει" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Συστήνει" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Ασύμβατο με" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Αντικαθιστά" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Απαρχαιώνει" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "σημαντικό" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "απαιτούμενο" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "καθιερωμένο" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "προαιρετικό" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "επιπλέον" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Κατασκευή Δένδρου Εξαρτήσεων" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Υποψήφιες Εκδόσεις" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Παραγωγή Εξαρτήσεων" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Αποτυχία ανοίγματος του %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Αποτυχία εγγραφής του αρχείου %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)" @@ -2415,7 +2429,7 @@ msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγ msgid "Opening %s" msgstr "Άνοιγμα του %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s." @@ -2504,19 +2518,19 @@ msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπι msgid "Method %s did not start correctly" msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε " "enter." -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων" @@ -2562,93 +2576,109 @@ msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκ msgid "Error occurred while processing %s (NewPackage)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το " "APT." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Συλλογή Παροχών Αρχείου" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "απέτυχε η μετονομασία, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 msgid "There are no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2657,7 +2687,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2666,7 +2696,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο." -#: apt-pkg/acquire-item.cc:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2674,7 +2704,7 @@ msgstr "" "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/acquire-item.cc:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" @@ -2683,7 +2713,7 @@ msgstr "Ανόμοιο μέγεθος" msgid "Vendor block %s contains no fingerprint" msgstr "Η εγγραφή κατασκευαστή %s δεν περιέχει ταυτότητα" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2692,47 +2722,49 @@ msgstr "" "Χρησιμοποιείται το σημείο προσάρτησης %s\n" "Προσαρτάται το CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Αναγνώριση..." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Αποθήκευση Ετικέτας: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Χρησιμοποιείται το σημείο προσάρτησης %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Αποπροσάρτηση του CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Αναμονή για δίσκο...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Προσάρτηση του CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Σάρωση του δίσκου για περιεχόμενα...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Βρέθηκαν %i κατάλογοι πακέτων, %i κατάλογοι πηγαίων και %i υπογραφές\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Αυτό δεν είναι έγκυρο όνομα, προσπαθείστε ξανά. \n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2741,38 +2773,38 @@ msgstr "" "Ο δίσκος αυτός ονομάζεται: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Αντιγραφή λιστών πακέτων..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Eγγραφή νέας λίστας πηγών\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Αποπροσάρτηση του CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Εγιναν %i εγγραφές.\n" -#: 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 "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n" -#: 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 "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n" -#: 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 "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n" @@ -2827,10 +2859,19 @@ msgstr "Προετοιμασία ρύθμισης του %s" msgid "Completely removed %s" msgstr "Αποτυχία διαγραφής του %s" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Αδύνατο το άνοιγμα του αρχείου %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Η σύνδεση έκλεισε πρόωρα" +#: apt-pkg/acquire-item.cc:1097 +msgid "There is no public key available for the following key IDs:\n" +msgstr "" + #~ msgid "File date has changed %s" #~ msgstr "Η ημερομηνία του αρχείου %s έχει αλλάξει" diff --git a/po/en_GB.po b/po/en_GB.po index b2a265f7a..4d6742658 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,159 +1,169 @@ # 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-08-09 23:46+0200\n" -"PO-Revision-Date: 2002-11-10 20:56+0100\n" +"POT-Creation-Date: 2006-08-15 15:55+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" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Package %s version %s has an unmet dep:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Unable to locate package %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Total package names : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Normal packages: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Pure virtual packages: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Single virtual packages: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Mixed virtual packages: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Missing: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Total distinct versions: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Total distinct versions: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Total dependencies: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Total ver/file relations: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Total ver/file relations: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Total Provides mappings: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Total globbed strings: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Total dependency version space: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Total slack space: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Total space accounted for: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Package file %s is out of sync." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "You must give exactly one pattern" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "No packages found" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Package files:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache is out of sync, can't x-ref a package file" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Pinned packages:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(not found)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Installed: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(none)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Candidate: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Package pin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Version table:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 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" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -300,7 +310,7 @@ msgstr "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Unable to write to %s" @@ -437,6 +447,8 @@ 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 @@ -469,11 +481,11 @@ msgstr "W: Unable to stat %s\n" #: ftparchive/writer.cc:135 msgid "E: " -msgstr "E:" +msgstr "E: " #: ftparchive/writer.cc:137 msgid "W: " -msgstr "W:" +msgstr "W: " #: ftparchive/writer.cc:144 msgid "E: Errors apply to file " @@ -533,14 +545,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " %s maintainer is %s not %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s has no override entry\n" +msgstr " %s has no source override entry\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s has no override entry\n" +msgstr " %s has no binary override entry either\n" #: ftparchive/contents.cc:317 #, c-format @@ -613,7 +625,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" @@ -678,7 +690,7 @@ msgstr "but it is not going to be installed" #: cmdline/apt-get.cc:347 msgid " or" -msgstr "or" +msgstr " or" #: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" @@ -742,118 +754,118 @@ msgstr "%lu to remove and %lu not upgraded.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu not fully installed or removed.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Correcting dependencies..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " failed." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Unable to correct dependencies" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 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:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr "Done" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "You might want to run ‘apt-get -f install’ to correct these." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Unmet dependencies. Try using -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "WARNING: The following packages cannot be authenticated!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Authentication warning overridden.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Install these packages without verification [y/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Some packages could not be authenticated" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "There are problems and -y was used without --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Internal error, InstallPackages was called with broken packages!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Packages need to be removed but remove is disabled." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Internal error, Ordering didn't finish" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Unable to lock the download directory" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "The list of sources could not be read." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "How odd.. The sizes didn't match, email apt@packages.debian.org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Need to get %sB/%sB of archives.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Need to get %sB of archives.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "After unpacking %sB of additional disk space will be used.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "After unpacking %sB disk space will be freed.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "Couldn't determine free space in %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, 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:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only specified but this is not a trivial operation." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -864,28 +876,28 @@ msgstr "" "To continue type in the phrase ‘%s’\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Abort." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Do you want to continue [Y/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Failed to fetch %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Some files failed to download" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Download complete and in download only mode" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -893,47 +905,47 @@ msgstr "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing and media swapping is not currently supported" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Unable to correct missing packages." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Aborting install." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Skipping %s, it is already installed and upgrade is not set.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Package %s is not installed, so not removed\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Package %s is a virtual package provided by:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Installed]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "You should explicitly select one to install." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -944,49 +956,49 @@ msgstr "" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "However the following packages replace it:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Package %s has no installation candidate" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s is already the newest version.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Selected version %s (%s) for %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "The update command takes no arguments" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Unable to lock the list directory" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -994,26 +1006,26 @@ msgstr "" "Some index files failed to download, they have been ignored, or old ones " "used instead." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "The following information may help to resolve the situation:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Internal error, problem resolver broke stuff" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, AllUpgrade broke stuff" @@ -1079,7 +1091,7 @@ msgstr "Recommended packages:" #: cmdline/apt-get.cc:1786 msgid "Calculating upgrade... " -msgstr "Calculating upgrade..." +msgstr "Calculating upgrade... " #: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" @@ -1103,9 +1115,9 @@ msgid "Unable to find a source package for %s" msgstr "Unable to find a source package for %s" #: cmdline/apt-get.cc:2043 -#, fuzzy, c-format +#, 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:2067 #, c-format @@ -1305,7 +1317,7 @@ msgstr "Ign " #: cmdline/acqprogress.cc:114 msgid "Err " -msgstr "Err" +msgstr "Err " #: cmdline/acqprogress.cc:135 #, c-format @@ -1548,9 +1560,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "The info and temp directories need to be on the same filesystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Reading package lists" @@ -1609,7 +1621,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 @@ -1684,11 +1696,13 @@ msgid "File not found" msgstr "File not found" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: methods/gzip.cc:141 methods/gzip.cc:150 msgid "Failed to stat" msgstr "Failed to stat" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Failed to set modification time" @@ -1816,7 +1830,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem hashing file" @@ -1901,9 +1915,9 @@ msgid "Unable to connect to %s %s:" msgstr "Unable to connect to %s %s:" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Could not resolve ‘%s’" +msgstr "Couldn't access keyring: '%s'" #: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." @@ -1920,9 +1934,9 @@ msgid "At least one invalid signature was encountered." msgstr "At least one invalid signature was encountered." #: methods/gpgv.cc:213 -#, fuzzy, c-format +#, 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:218 msgid "Unknown error executing gpgv" @@ -1940,86 +1954,86 @@ msgstr "" "The following signatures couldn't be verified because the public key is not " "available:\n" -#: methods/gzip.cc:57 +#: 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: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:375 msgid "Waiting for headers" msgstr "Waiting for headers" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Bad header line" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 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:584 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:599 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:601 msgid "This HTTP server has broken range support" msgstr "This HTTP server has broken range support" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "Unknown date format" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Select failed" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Connection timed out" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Error writing to output file" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Error writing to file" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Error writing to the file" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Error reading from server" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Bad header data" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Connection failed" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Internal error" @@ -2032,7 +2046,7 @@ msgstr "Cannot mmap an empty file" msgid "Couldn't make mmap of %lu bytes" msgstr "Couldn't make mmap of %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Selection %s not found" @@ -2092,12 +2106,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Done" @@ -2229,108 +2243,110 @@ msgstr "Problem unlinking the file" msgid "Problem syncing the file" msgstr "Problem syncing the file" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Empty package cache" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "The package cache file is corrupted" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "The package cache file is an incompatible version" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "This APT does not support the Versioning System ‘%s’" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "The package cache was built for a different architecture" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depends" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "PreDepends" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Suggests" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recommends" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Conflicts" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Replaces" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Obsoletes" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "required" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "optional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Building dependency tree" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Candidate versions" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Dependency generation" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Merging available information" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Failed to open %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Failed to write file ‘%s’" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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 "Unable to parse package file %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Unable to parse package file %s (2)" @@ -2365,7 +2381,7 @@ msgstr "Malformed line %lu in source list %s (dist parse)" msgid "Opening %s" msgstr "Opening %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Line %u too long in source list %s." @@ -2433,14 +2449,14 @@ msgstr "Archive directory %spartial is missing." #. 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 "Downloading file %li of %li (%s remaining)" +msgstr "Retrieving file %li of %li (%s remaining)" #: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#, 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 @@ -2452,18 +2468,18 @@ msgstr "The method driver %s could not be found." msgid "Method %s did not start correctly" msgstr "Method %s did not start correctly" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Packaging system ‘%s’ is not supported" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Unable to determine a suitable packaging system type" @@ -2506,90 +2522,107 @@ msgstr "Cache has an incompatible versioning system" msgid "Error occurred while processing %s (NewPackage)" msgstr "Error occurred while processing %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Error occurred while processing %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Error occurred while processing %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Error occurred while processing %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Error occurred while processing %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Error occurred while processing %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Error occurred while processing %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Error occurred while processing %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Error occurred while processing %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Wow, you exceeded the number of package names this APT can handle.." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wow, you exceeded the number of versions this APT can handle." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Wow, you exceeded the number of versions this APT can handle." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wow, you exceeded the number of dependencies this APT can handle." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Error occurred while processing %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Error occurred while processing %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Package %s %s was not found while processing file dependencies" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Couldn't stat source package list %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Collecting File Provides" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "IO Error saving source cache" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "rename failed, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "MD5Sum mismatch" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" -msgstr "" +msgstr "There is no public key available for the following key IDs:\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2598,7 +2631,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:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2607,14 +2640,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:854 +#: apt-pkg/acquire-item.cc:1305 #, 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:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Size mismatch" @@ -2623,7 +2656,7 @@ msgstr "Size mismatch" msgid "Vendor block %s contains no fingerprint" msgstr "Vendor block %s contains no fingerprint" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2632,47 +2665,49 @@ msgstr "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Identifying.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Stored label: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Using CD-ROM mount point %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Unmounting CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Waiting for disc...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Mounting CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Scanning disc for index files..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation 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:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2681,38 +2716,38 @@ msgstr "" "This disc is called: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Copying package lists..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Writing new source list\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Source list entries for this disc are:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Unmounting CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Wrote %i records.\n" -#: 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 "Wrote %i records with %i missing files.\n" -#: 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 "Wrote %i records with %i mismatched files\n" -#: 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 "Wrote %i records with %i missing files and %i mismatched files\n" @@ -2758,57 +2793,24 @@ 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/rred.cc:219 +msgid "Could not patch file" +msgstr "Could not patch file" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connection closed prematurely" -#~ msgid "File date has changed %s" -#~ msgstr "File date has changed %s" - -#~ msgid "Reading file list" -#~ msgstr "Reading file list" - -#~ 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?’..." +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +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" @@ -1,162 +1,174 @@ -# 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-08-09 23: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: 2006-08-15 15:55+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" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "El paquete %s versin %s tiene dependencias incumplidas:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "No se ha podido localizar el paquete %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Nombres de paquetes totales: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Paquetes normales: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Paquetes virtuales puros: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Paquetes virtuales nicos: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Paquetes virtuales mixtos: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Faltan: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Versiones diferentes totales: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Versiones diferentes totales: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Dependencias totales: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Relaciones versin/archivo totales: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Relaciones versin/archivo totales: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Mapeo Total de Provisiones: " # globbed -> globalizadas ? (jfs)
-#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Cadenas globalizadas totales: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Espacio de versin de dependencias total: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Espacio desperdiciado total: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Espacio registrado total: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "El archivo de paquetes %s est desincronizado." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Debe dar exactamente un patrn" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "No se encontr ningn paquete" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Archivos de paquetes:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Cach fuera de sincronismo, no se puede hacer x-ref a un archivo de paquetes" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Paquetes con pin:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(no encontrado)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Instalados: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(ninguno)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Pin del paquete: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Tabla de versin:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado en %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -308,7 +320,7 @@ msgstr "" " -o=? Establece una opcin de configuracin arbitraria, p. ej. -o dir::" "cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "No se puede escribir en %s" @@ -450,6 +462,8 @@ 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 @@ -546,14 +560,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " el encargado de %s es %s y no %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s no tiene entrada de predominio\n" +msgstr " %s no tiene una entrada fuente predominante\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s no tiene entrada de predominio\n" +msgstr " %s tampoco tiene una entrada binaria predominante\n" #: ftparchive/contents.cc:317 #, c-format @@ -755,121 +769,121 @@ msgstr "%lu para eliminar y %lu no actualizados.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu no instalados del todo o eliminados.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Corrigiendo dependencias..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " fall." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "No se puede corregir las dependencias" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "No se puede minimizar el conjunto de actualizacin" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Listo" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: No se han podido autenticar los siguientes paquetes!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Aviso de autenticacin ignorado.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Instalar estos paquetes sin verificacin [s/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Algunos paquetes no se pueden autenticar" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Hay problemas y se utiliz -y sin --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Error interno, InstallPackages fue llamado con un paquete roto!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Los paquetes necesitan eliminarse pero Remove est deshabilitado." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Error interno, no termin el ordenamiento" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "No se pudieron leer las listas de fuentes." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Que raro.. Los tamaos no concuerdan, mande un correo a \n" "apt@packages.debian.org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Se necesita descargar %sB/%sB de archivos.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Necesito descargar %sB de archivos.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Se utilizarn %sB de espacio de disco adicional despus de desempaquetar.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Se liberarn %sB despus de desempaquetar.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "No pude determinar el espacio libre en %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "No tiene suficiente espacio libre en %s." -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Se especific Trivial Only pero sta no es una operacin trivial." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "S, haga lo que le digo!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -880,28 +894,28 @@ msgstr "" "Para continuar escriba la frase %s\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Abortado." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Desea continuar [S/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Algunos archivos no pudieron descargarse" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de slo descarga" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -909,47 +923,47 @@ msgstr "" "No se pudieron obtener algunos archivos, quizs deba ejecutar\n" "apt-get update o deba intentarlo de nuevo con --fix-missing?" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "Actualmente no estn soportados --fix-missing e intercambio de medio" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "No se pudieron corregir los paquetes que faltan." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Abortando la instalacin." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, seleccionando %s en lugar de %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Ignorando %s, ya esta instalado y la actualizacin no esta activada.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "El paquete %s no esta instalado, no se eliminar\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquete %s es un paquete virtual provisto por:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Necesita seleccionar explcitamente uno para instalar." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -960,49 +974,49 @@ msgstr "" "a l. Esto puede significar que el paquete falta, est obsoleto o slo se\n" "encuentra disponible desde alguna otra fuente\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Sin embargo, los siguientes paquetes lo reemplazan:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "El paquete %s no tiene candidato para su instalacin" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ya est en su versin ms reciente.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No se encontr la Distribucin '%s' para '%s'" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No se encontr la versin '%s' para '%s'" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versin seleccionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "El comando de actualizacin no toma argumentos" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "No se pudo bloquear el directorio de listas" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1010,28 +1024,28 @@ msgstr "" "Algunos archivos de ndice no se han podido descargar, se han ignorado,\n" "o se ha utilizado unos antiguos en su lugar." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "La siguiente informacin puede ayudar a resolver la situacin:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "" "Error interno, el sistema de solucin de problemas rompi\n" "algunas cosas" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error Interno, AllUpgrade rompi cosas" @@ -1123,9 +1137,9 @@ msgid "Unable to find a source package for %s" msgstr "No se pudo encontrar un paquete de fuentes para %s" #: cmdline/apt-get.cc:2043 -#, fuzzy, c-format +#, 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:2067 #, c-format @@ -1580,9 +1594,9 @@ msgstr "" "Los directorios info y temp deben de estar en el mismo sistema de archivos" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Leyendo lista de paquetes" @@ -1716,11 +1730,13 @@ msgid "File not found" msgstr "Fichero no encontrado" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: methods/gzip.cc:141 methods/gzip.cc:150 msgid "Failed to stat" msgstr "No pude leer" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "No pude poner el tiempo de modificacin" @@ -1848,7 +1864,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Hay problemas enlazando fichero" @@ -1933,9 +1949,9 @@ msgid "Unable to connect to %s %s:" msgstr "No pude conectarme a %s %s:" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, 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:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." @@ -1953,9 +1969,10 @@ msgid "At least one invalid signature was encountered." msgstr "Se encontr al menos una firma invlida." #: methods/gpgv.cc:213 -#, fuzzy, c-format +#, 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:218 msgid "Unknown error executing gpgv" @@ -1973,86 +1990,86 @@ msgstr "" "Las firmas siguientes no se pudieron verificar porque su llave pblica no " "est disponible:\n" -#: methods/gzip.cc:57 +#: 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: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:375 msgid "Waiting for headers" msgstr "Esperando las cabeceras" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Mala lnea de cabecera" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 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:584 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:599 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:601 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:625 msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Fall la seleccin" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Expir la conexin" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Fallo la conexin" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Error interno" @@ -2065,7 +2082,7 @@ msgstr "No puedo hacer mmap de un fichero vaco" msgid "Couldn't make mmap of %lu bytes" msgstr "No pude hacer mmap de %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Seleccin %s no encontrada" @@ -2127,12 +2144,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Hecho" @@ -2266,108 +2283,110 @@ msgstr "Hay problemas desligando el fichero %s" msgid "Problem syncing the file" msgstr "Hay problemas sincronizando el fichero" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cach de paquetes vaca." -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "El archivo de cach de paquetes esta corrompido" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "El archivo de cach de paquetes es una versin incompatible" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Este APT no soporta el sistema de versiones '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "La cach de paquetes se haba creado para una arquitectura diferente" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "PreDepende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Sugiere" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recomienda" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Entra en conflicto" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Reemplaza" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Hace obsoleto" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "requiere" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "estndar" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Creando rbol de dependencias" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Versiones candidatas" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Generacin de dependencias" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Fusionando informacin disponible" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "No se pudo abrir %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Fall la escritura del archivo %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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 "No se pudo tratar el archivo de paquetes %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 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)" @@ -2402,7 +2421,7 @@ msgstr "Lnea %lu mal formada en lista de fuentes %s (anlisis de dist)" msgid "Opening %s" msgstr "Abriendo %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Lnea %u demasiado larga en la lista de fuentes %s." @@ -2474,14 +2493,14 @@ 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 +#, 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 +#, 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 @@ -2493,17 +2512,17 @@ msgstr "No se pudo encontrar el mtodo %s." msgid "Method %s did not start correctly" msgstr "El mtodo %s no se inici correctamente" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Por favor, inserte el disco %s en la unidad %s y presione Intro" -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema de paquetes '%s' no est soportado" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado" @@ -2549,95 +2568,114 @@ msgstr "La cach tiene una versin incompatible de sistema de versiones" msgid "Error occurred while processing %s (NewPackage)" msgstr "Ocurri un error mientras se procesaba %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Ocurri un error mientras se procesaba %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Ocurri un error mientras se procesaba %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Ocurri un error mientras se procesaba %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Ocurri un error mientras se procesaba %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Ocurri un error mientras se procesaba %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Ocurri un error mientras se procesaba %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Ocurri un error mientras se procesaba %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Ocurri un error mientras se procesaba %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Vaya, excedi el nmero de nombres de paquetes que este APT es capaz de " "manejar." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Vaya, excedi el nmero de versiones que este APT es capaz de manejar." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Vaya, excedi el nmero de versiones que este APT es capaz de manejar." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Vaya, excedi el nmero de dependencias que este APT es capaz de manejar." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Ocurri un error mientras procesaba %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Ocurri un error mientras procesaba %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Al procesar las dependencias de archivos no se encontr el\n" "paquete %s %s" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "No se puede leer la lista de paquetes fuente %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Recogiendo archivos que proveen" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "Error de E/S guardando cach fuente" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format 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:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "La suma MD5 difiere" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are 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:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2647,7 +2685,7 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2656,7 +2694,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:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2664,7 +2702,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:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "El tamao difiere" @@ -2673,7 +2711,7 @@ msgstr "El tamao difiere" msgid "Vendor block %s contains no fingerprint" msgstr "Bloque de fabricante %s sin huella digital" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2682,47 +2720,49 @@ msgstr "" "Usando el punto de montaje del CD-ROM %s\n" "Montando el CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Identificando.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Etiqueta guardada: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Usando el punto de montaje del CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Desmontando el CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Esperando el disco...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Montando el CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Buscando en el disco archivos de ndices...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation 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:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2731,38 +2771,38 @@ msgstr "" "Este disco se llama: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Copiando las listas de paquetes..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Escribiendo nueva lista de fuente\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 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 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Desmontando CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "%i registros escritos.\n" -#: 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 "%i registros escritos con %i fichero de menos.\n" -#: 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 "%i registros escritos con %i fichero mal emparejado\n" -#: 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 "" @@ -2809,19 +2849,30 @@ 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/rred.cc:219 +msgid "Could not patch file" +msgstr "No pude parchear el fichero" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "La conexin se cerr prematuramente" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +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" + #~ msgid "File date has changed %s" #~ msgstr "Cambi la fecha del archivo %s" @@ -7,158 +7,168 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" -"PO-Revision-Date: 2006-06-17 00:10+0200\n" +"POT-Creation-Date: 2006-08-15 15:55+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" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.2\n" +"X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" "\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "%s paketeak (%s bertsioa) mendekotasun-arazo bat du:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Ezin da %s paketea lokalizatu" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Pakete Izenak Guztira : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Pakete normalak:" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Pakete birtual puruak:" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Bakanako pakete birtualak: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Nahastutako pakete birtualak: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Falta direnak: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Bertsio Ezberdinak Guztira: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Bertsio Ezberdinak Guztira: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Dependentziak Guztira: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Guztira Bertsio/fitxategi erlazioak: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Guztira Bertsio/fitxategi erlazioak: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Guztira Saltzaile Mapatzea: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Guztira beteratutakokateak: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Guztira bertsio dependentzi lekua: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Guztira galdutako tokia:" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Guztira erregitratutako lekua: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "%s pakete-fitxategia ez dago sinkronizatuta." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Zehazki eredu bat eman behar duzu." -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Ez da paketerik aurkitu" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Pakete Fitxatefiak:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Cachea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin " "pakete-fitxategi bati" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Pin duten Paketeak:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(ez da aurkitu)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Instalatuta: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(bat ere ez)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Hautagaia: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Paketearen pin-a:" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Bertsio tabla:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s (%s %s) konpilatua: %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -305,7 +315,7 @@ msgstr "" " -c=? Irakurri konfigurazio-fitxategi hau\n" " -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "%s : ezin da idatzi" @@ -441,6 +451,8 @@ msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" +"DB formatu baliogabe da. Apt bertsio zaharrago batetik eguneratu baduzu, " +"mesedez datubasea ezabatu eta birsortu." #: ftparchive/cachedb.cc:81 #, c-format @@ -537,14 +549,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " %s mantentzailea %s da, eta ez %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s: ez du override sarrerarik\n" +msgstr " %s: ez du jatorri gainidazketa sarrerarik\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s: ez du override sarrerarik\n" +msgstr " %s: ez du bitar gainidazketa sarrerarik\n" #: ftparchive/contents.cc:317 #, c-format @@ -746,120 +758,120 @@ msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu ez erabat instalatuta edo kenduta.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Mendekotasunak zuzentzen..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " : huts egin du." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Ezin dira mendekotasunak zuzendu" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Ezin da bertsio-berritzeko multzoa minimizatu" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Eginda" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu zuzentzeko." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Egiaztapen abisua gainidazten.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Paketeak egiaztapen gabe instalatu [b/E]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Zenbait pakete ezin dira egiaztatu" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Arazoak daude, eta -y erabili da --force-yes gabe" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Barne errorea, ez da ordenatzeaz amaitu" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Ezin da deskarga-direktorioa blokeatu" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Ezin izan da iturburu-zerrenda irakurri." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Hau bitxia.. Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra " "berri emanez (ingelesez)" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Artxiboetako %sB/%sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Deskonprimitu ondoren, %sB gehiago erabiliko dira diskoan.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Deskonprimitu ondoren, %sB libratuko dira diskoan.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ezin da %s(e)n duzun leku librea atzeman." -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Ez daukazu nahikoa leku libre %s(e)n." -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Bai, egin esandakoa!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -870,28 +882,28 @@ msgstr "" "Jarratzeko, idatzi '%s' esaldia\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Abortatu." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -899,47 +911,47 @@ msgstr "" "Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo " "--fix-missing aukerarekin saiatu?" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing eta euskarri-aldaketa ez dira onartzen oraingoz" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Falta diren paketeak ezin dira zuzendu." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Abortatu instalazioa." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Oharra, %s hautatzen %s(r)en ordez\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s pakete birtual bat da, honek hornitua:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Instalatuta]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Zehazki bat hautatu behar duzu instalatzeko." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -950,49 +962,49 @@ msgstr "" "egiten dio. Beharbada paketea faltako da, edo zaharkituta egongo da, edo \n" "beste iturburu batean bakarrik egongo da erabilgarri\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Baina ondorengo paketeek ordezten dute:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "%s paketeak ez du instalatzeko hautagairik" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s bertsiorik berriena da jada.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Ezin da zerrenda-direktorioa blokeatu" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1000,26 +1012,26 @@ msgstr "" "Indize-fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo " "zaharrak erabili dira haien ordez." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "Informazio honek arazoa konpontzen lagun dezake:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" @@ -1556,9 +1568,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "info eta temp direktorioek fitxategi-sistema berean egon behar dute" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Pakete Zerrenda irakurtzen" @@ -1694,11 +1706,13 @@ msgid "File not found" msgstr "Ez da fitxategia aurkitu" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: 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:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Huts egin du aldaketa-ordua ezartzean" @@ -1829,7 +1843,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" @@ -1954,86 +1968,86 @@ msgstr "" "Ondorengo sinadurak ezin dira egiaztatu gako publikoa ez bait dago " "eskuragarri:\n" -#: methods/gzip.cc:57 +#: 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: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:375 msgid "Waiting for headers" msgstr "Goiburuen zain" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Okerreko goiburu-lerroa" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 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:584 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:599 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:601 msgid "This HTTP server has broken range support" msgstr "http zerbitzariak barruti onarpena apurturik du" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "Datu-formatu ezezaguna" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Konexioaren denbora-muga gainditu da" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:874 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:876 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Barne-errorea" @@ -2046,7 +2060,7 @@ msgstr "Ezin da fitxategi huts baten mmap egin" msgid "Couldn't make mmap of %lu bytes" msgstr "Ezin izan da %lu byteren mmap egin" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "%s hautapena ez da aurkitu" @@ -2106,12 +2120,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Eginda" @@ -2247,108 +2261,110 @@ msgstr "Arazoa fitxategia desestekatzean" msgid "Problem syncing the file" msgstr "Arazoa fitxategia sinkronizatzean" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Paketeen cachea hutsik" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Paketeen cache-fitxategia hondatuta dago" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Paketeen cache-fitxategiaren bertsioa ez da bateragarria" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "APT honek ez du '%s' bertsio sistema onartzen" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Paketeen cachea beste arkitektura batentzat sortuta dago" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Mendekotasuna:" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Aurremendekotasuna:" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Iradokizuna:" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Gomendioa:" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Gatazka:" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Ordeztea:" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Zaharkitzea:" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "garrantzitsua" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "beharrezkoa" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "estandarra" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "aukerakoa" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "estra" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Dependentzia zuhaitza eraikitzen" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Hautagaien bertsioak" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Dependentzi Sormena" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Eskuragarrien datuak biltzen" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Huts egin du %s irekitzean" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Ezin izan da %s fitxategian idatzi" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ezin da %s pakete-fitxategia analizatu (2)" @@ -2383,7 +2399,7 @@ msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist analisia)" msgid "Opening %s" msgstr "%s irekitzen" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "%2$s iturburu-zerrendako %1$u lerroa luzeegia da." @@ -2471,17 +2487,17 @@ msgstr "Ezin izan da %s metodo-kontrolatzailea aurkitu." msgid "Method %s did not start correctly" msgstr "%s metodoa ez da behar bezala abiarazi" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu" -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "'%s' pakete-sistema ez da onartzen" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Ezin da pakete-sistemaren mota egokirik zehaztu" @@ -2524,90 +2540,107 @@ msgstr "Cachearen bertsio-sistema ez da bateragarria" msgid "Error occurred while processing %s (NewPackage)" msgstr "Errorea gertatu da %s prozesatzean (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Errorea gertatu da %s prozesatzean (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Errorea gertatu da %s prozesatzean (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Errorea gertatu da %s prozesatzean (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Errorea gertatu da %s prozesatzean (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Errorea gertatu da %s prozesatzean (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "APT honek maneia dezakeen pakete-izenen kopurua gainditu duzu." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "APT honek maneia dezakeen bertsio-kopurua gainditu duzu." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "APT honek maneia dezakeen bertsio-kopurua gainditu duzu." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "APT honek maneia dezakeen mendekotasun-kopurua gainditu duzu." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Errorea gertatu da %s prozesatzean (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Errorea gertatu da %s prozesatzean (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "%s %s paketea ez da aurkitu fitxategi-mendekotasunak prozesatzean" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ezin da atzitu %s iturburu-paketeen zerrenda" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Fitxategi-erreferentziak biltzen" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "S/I errorea iturburu-cachea gordetzean" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format 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:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "MD5Sum ez dator bat" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy 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:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2616,7 +2649,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2625,7 +2658,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea." -#: apt-pkg/acquire-item.cc:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2633,7 +2666,7 @@ msgstr "" "Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " "paketearentzat." -#: apt-pkg/acquire-item.cc:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Tamaina ez dator bat" @@ -2642,7 +2675,7 @@ msgstr "Tamaina ez dator bat" msgid "Vendor block %s contains no fingerprint" msgstr "%s saltzaile blokeak ez du egiaztapen markarik" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2651,47 +2684,49 @@ msgstr "" "%s CD-ROM muntatze puntua erabiltzen\n" "CD-ROM-a muntatzen\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Egiaztatzen... " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Gordetako Etiketa: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "%s CD-ROM muntatze puntua erabiltzen\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM-a desmuntatzen\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Diska itxaroten...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM-a muntatzen...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Indize fitxategien bila diska arakatzen...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation 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:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2700,38 +2735,38 @@ msgstr "" "Diskaren izen:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Pakete zerrendak kopiatzen..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "jatorri zerrenda berria idazten\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Diskarentzako jaotrri sarrerak:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "CD-ROM Desmuntatzen..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "%i erregistro grabaturik.\n" -#: 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 "%i erregistro eta %i galdutako fitxategi grabaturik.\n" -#: 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 "%i erregistro eta %i okerreko fitxategi grabaturik.\n" -#: 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 "" @@ -2787,9 +2822,16 @@ msgstr "%s guztiz ezabatzeko prestatzen" msgid "Completely removed %s" msgstr "%s guztiz ezabatu da" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "%s fitxategia ezin izan da ireki" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Konexioa behar baino lehenago itxi da" -#~ msgid "File date has changed %s" -#~ msgstr "Fitxategi-data aldatu egin da: %s" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +msgid "There is no public key available for the following key IDs:\n" +msgstr "Hurrengo gako ID hauentzat ez dago gako publiko eskuragarririk:\n" @@ -1,15 +1,15 @@ # translation of fi.po to Finnish # Finnish translation of apt. # This file is put in the public domain. -# Tapio Lehtonen <tale@debian.org>, 2004. -# -# +# Tapio Lehtonen <tale@debian.org>, 2004-2006. +# +# msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" -"PO-Revision-Date: 2005-02-15 14:09+0200\n" +"POT-Creation-Date: 2006-08-15 15:55+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" "MIME-Version: 1.0\n" @@ -17,145 +17,155 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paketin %s versiossa %s on tyydyttämätön riippuvuus:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Pakettia %s ei löydy" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Pakettien kokonaismäärä : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Tavallisia paketteja: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Aitoja näennäispaketteja: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Yksinkertaisia näennäispaketteja: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Sekanäennäispaketteja: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Puuttuu: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Eri versioita yhteensä: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Eri versioita yhteensä: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Riippuvuuksia yhteensä: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Versio/tdsto suhteita yht: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Versio/tdsto suhteita yht: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Tarjoamiskuvauksia yhteensä: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Erilaisia merkkijonoja yhteensä: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Versioriippuvuustila yhteensä: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Löysää tilaa yhteensä: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Käytetty tila yhteensä: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Pakettitiedosto %s ei ole ajan tasalla." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "On annettava täsmälleen yksi lauseke" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Yhtään pakettia ei löytynyt" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Pakettitiedostot:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Varasto ei ole ajan tasalla, pakettitiedostoa ei löydy kansiosta" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Paketit joissa tunniste:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(ei löydy)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Asennettu: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(ei mitään)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Ehdokas: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Paketin tunnistenumero: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Versiotaulukko:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s laitealustalle %s %s käännöksen päiväys %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -230,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 "Kirjoita levylle nimi, kuten \"Debian 2.1r1 Levy 1\"" #: cmdline/apt-cdrom.cc:93 -#, fuzzy msgid "Please insert a Disc in the drive and press enter" -msgstr "" -"Taltion vaihto: Pistä levy \n" -"\"%s\"\n" -"asemaan \"%s\" ja paina Enter\n" +msgstr "Aseta levy asemaan ja paina Enter" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "" +msgstr "Toista tämä lopuille rompuille kasassasi." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" @@ -305,7 +311,7 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Tiedostoon %s kirjoittaminen ei onnistu" @@ -340,7 +346,6 @@ msgid "Error processing contents %s" msgstr "Tapahtui virhe käsiteltäessä sisällysluetteloa %s" #: ftparchive/apt-ftparchive.cc:556 -#, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -389,31 +394,31 @@ msgstr "" " generate asetukset [ryhmät]\n" " clean asetukset\n" "\n" -"apt-ftparchive tuottaa hakemiston Debianin arkistoista. Monta " +"apt-ftparchive tuottaa hakemistoja Debianin arkistoista. Monta " "tuottamistapaa\n" "on tuettu alkaen täysin automaattisista toiminnallisesti samoihin kuin\n" "dpkg-scanpackages ja dpkg-scansources.\n" "\n" -"apt-ftparchive tuottaa pakettitiedostoja deb-tiedostojen puusta.\n" +"apt-ftparchive tuottaa pakettitiedostoja .deb-tiedostojen puusta.\n" "Pakettitiedostossa on kunkin paketin kaikkien ohjauskenttien\n" -"sisältö sekä MD5 hajautustunnus ja tiedoston koko. Poikkeus-\n" +"sisältö sekä MD5 tiiviste ja tiedoston koko. Poikkeus-\n" "tiedostolla voidaan arvot Priority ja Section pakottaa halutuiksi.\n" "\n" "Samaan tapaan apt-ftparchive tuottaa lähdetiedostoja\n" -"dscs-tiedostojen puusta. Valitsimella --source-overrride voidaan\n" +".dscs-tiedostojen puusta. Valitsimella --source-overrride voidaan\n" "määrittää lähteiden poikkeustiedosto.\n" "\n" "Komennot \"packages\" ja \"sources\" olisi suoritettava puun juuressa.\n" -"Binääripolun olisi osoitettava rekursiivisen haun alkukohtaan ja \n" +"Binääripolun olisi osoitettava rekursiivisen haun alkukohtaan ja\n" "poikkeustiedostossa olisi oltava poikkeusilmaisimet. Polun alku\n" -"yhdistetään tiedoston nimen jos se on annettu. Esimerkki \n" +"yhdistetään tiedoston nimeen jos se on annettu. Esimerkki\n" "käytöstä Debianin arkiston kanssa:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" "\n" "Valitsimet:\n" " -h Tämä ohje\n" -" --md5 Ohjauskentän MD5\n" +" --md5 MD5 luonti\n" " -s=? Lähteiden poikkeustdosto\n" " -q Ei tulostusta\n" " -d=? Valinnainen välimuistitietokanta\n" @@ -446,6 +451,8 @@ 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." #: ftparchive/cachedb.cc:81 #, c-format @@ -534,7 +541,7 @@ msgstr "Arkistossa ei ollut pakettikenttää" #: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" -msgstr " %s: ei poikkeustietuetta\n" +msgstr " %s:llä ei ole poikkeustietuetta\n" #: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format @@ -542,14 +549,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " %s ylläpitäjä on %s eikä %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s: ei poikkeustietuetta\n" +msgstr " %s:llä ei ole poikkeustietuetta\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s: ei poikkeustietuetta\n" +msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n" #: ftparchive/contents.cc:317 #, c-format @@ -719,12 +726,11 @@ msgid "%s (due to %s) " msgstr "%s (syynä %s) " #: cmdline/apt-get.cc:547 -#, 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 "" -"VAROITUS: Seuraavat välttämättömät paketit on merkitty poistettaviksi\n" +"VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n" "Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!" #: cmdline/apt-get.cc:578 @@ -752,200 +758,200 @@ msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Korjataan riippuvuuksia..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " ei onnistunut." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Riippuvuuksien korjaus ei onnistu" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Päivitysjoukon minimointi ei onnistu" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Valmis" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Varoitus varmistamisesta on ohitettu.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Asennetaanko nämä paketit ilman todennusta [y/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä." -#: cmdline/apt-get.cc:776 -#, fuzzy +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" -msgstr "Tapahtui sisäinen virhe lisättäessä korvautusta" +msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Lähteiden luetteloa ei pystynyt lukemaan." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" +"No jo on... Koot eivät täsmää, sähköpostita email apt@packages.debian.org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Noudettavaa arkistoa %st/%st.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Noudettavaa arkistoa %st.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Purkamisen jälkeen käytetään %st lisää levytilaa.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Purkamisen jälkeen vapautuu %st levytilaa.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 -#, fuzzy, c-format +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 +#, c-format msgid "Couldn't determine free space in %s" -msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" +msgstr "Kansion %s vapaan tilan määrä ei selvinnyt" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa." -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Kyllä, tee kuten käsketään!" -#: cmdline/apt-get.cc:869 -#, fuzzy, c-format +#: cmdline/apt-get.cc:883 +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Olet aikeissa tehdä mahdollisesti vahingollisen toimenpiteen\n" +"Olet aikeissa tehdä mahdollisesti vahingollisen toimenpiteen.\n" "Jatka kirjoittamalla \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Keskeytä." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Joidenkin tiedostojen nouto ei onnistunut" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\"auttaa tai " +"Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\" auttaa tai " "kokeile --fix-missing?" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Puuttuvia paketteja ei voi korjata." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Asennus keskeytetään." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Huomautus, valitaan %s eikä %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paketti %s on näennäispaketti, jonka kattaa:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Asennettu]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Yksi pitää valita asennettavaksi." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -956,49 +962,49 @@ msgstr "" "Tämä voi tarkoittaa paketin puuttuvan, olevan vanhentunut tai\n" "saatavilla vain jostain muusta lähteestä\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Seuraavat paketit kuitenkin korvaavat sen:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Paketilla %s ei ole asennettavaa valintaa" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s on jo uusin versio.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Valittiin versio %s (%s) paketille %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Komento update ei käytä parametreja" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Luettelokansiota ei voitu lukita" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1006,26 +1012,26 @@ msgstr "" "Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai " "käytetty vanhoja. " -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" -msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" +msgstr "Sisäinen virhe, resolver rikkoi jotain" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" @@ -1101,9 +1107,8 @@ msgid "Done" msgstr "Valmis" #: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869 -#, fuzzy msgid "Internal error, problem resolver broke stuff" -msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" +msgstr "Sisäinen virhe, resolver rikkoi jotain" #: cmdline/apt-get.cc:1969 msgid "Must specify at least one package to fetch source for" @@ -1115,9 +1120,9 @@ msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" #: cmdline/apt-get.cc:2043 -#, fuzzy, c-format +#, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n" +msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n" #: cmdline/apt-get.cc:2067 #, c-format @@ -1156,7 +1161,7 @@ msgstr "Purkukomento \"%s\" ei onnistunut.\n" #: cmdline/apt-get.cc:2153 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" #: cmdline/apt-get.cc:2170 #, c-format @@ -1474,7 +1479,7 @@ msgid "Duplicate conf file %s/%s" msgstr "Asetustiedoston kaksoiskappale %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" msgstr "Tiedoston %s kirjoittaminen ei onnistunut" @@ -1562,9 +1567,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Kansioiden info ja temp pitää olla samassa tiedostojärjestelmässä" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Luetaan pakettiluetteloita" @@ -1690,20 +1695,21 @@ 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 -#, fuzzy msgid "Disk not found." -msgstr "Tiedostoa ei löydy" +msgstr "Levyä ei löydy" #: methods/cdrom.cc:177 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:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: 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:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua" @@ -1831,7 +1837,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" @@ -1916,123 +1922,127 @@ msgid "Unable to connect to %s %s:" msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Nimeä \"%s\" ei voitu selvittää" +msgstr "Avainrengasta \"%s\" ei saatavilla" #: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" +"E: Parametrien luettelo Acquire::gpgv::Options liian pitkä. Lopetetaan." #: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" +"Sisäinen virhe: Allekirjoitus kelpaa, mutta avaimen sormenjälki tuntematon?!" #: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus." #: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" +"Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gnupg asennettu?)" #: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv" #: methods/gpgv.cc:249 -#, fuzzy msgid "The following signatures were invalid:\n" -msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" +msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n" #: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"Seuraavia allekirjoituksia ei voinut varmentaa koska julkista avainta ei ole " +"saatavilla:\n" -#: methods/gzip.cc:57 +#: 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: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:375 msgid "Waiting for headers" msgstr "Odotetaan otsikoita" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Virheellinen otsikkorivi" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon" -#: methods/http.cc:585 +#: methods/http.cc:584 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:599 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:601 msgid "This HTTP server has broken range support" msgstr "HTTP-palvelimen arvoaluetuki on rikki" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Sisäinen virhe" @@ -2045,7 +2055,7 @@ msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia" msgid "Couldn't make mmap of %lu bytes" msgstr "Ei voitu tehdä %lu tavun mmap:ia" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Valintaa %s ei löydy" @@ -2105,12 +2115,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Valmis" @@ -2242,108 +2252,110 @@ msgstr "Pulmia tehtäessä tiedostolle unlink" msgid "Problem syncing the file" msgstr "Pulmia tehtäessä tiedostolle sync" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Pakettivarasto on tyhjä" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Pakettivarasto on turmeltunut" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Pakettivaraston versio on yhteensopimaton" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Tämä APT ei tue versionhallintajärjestelmää \"%s\"" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Pakettivarasto on tehty muulle arkkitehtuurille" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Riippuvuudet" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Esiriippuvuudet" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Ehdotukset" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Suosittelut" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Ristiriidat" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Korvaavuudet" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Täydet korvaavuudet" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "tärkeä" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "välttämätön" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "perus" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "valinnainen" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "ylimääräinen" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Muodostetaan riippuvuussuhteiden puu" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Mahdolliset versiot" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Luodaan riippuvuudet" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Yhdistetään saatavuustiedot" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Tiedoston %s avaaminen ei onnistunut" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Tiedoston %s kirjoittaminen ei onnistunut" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Pakettitiedostoa %s (2) ei voi jäsentää" @@ -2378,7 +2390,7 @@ msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" msgid "Opening %s" msgstr "Avataan %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Rivi %u on liian pitkä lähdeluettelossa %s." @@ -2389,7 +2401,7 @@ msgid "Malformed line %u in source list %s (type)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)" #: apt-pkg/sourcelist.cc:244 -#, fuzzy, c-format +#, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" @@ -2447,12 +2459,12 @@ msgstr "Arkistokansio %spartial puuttuu." #: apt-pkg/acquire.cc:823 #, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "" +msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)" #: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#, c-format msgid "Retrieving file %li of %li" -msgstr "Luetaan tiedostoluetteloa" +msgstr "Noudetaan tiedosto %li / %li" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2464,20 +2476,17 @@ msgstr "Menetelmän ajuria %s ei löytynyt" msgid "Method %s did not start correctly" msgstr "Menetelmä %s ei käynnistynyt oikein" -#: apt-pkg/acquire-worker.cc:384 -#, fuzzy, c-format +#: apt-pkg/acquire-worker.cc:377 +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"Taltion vaihto: Pistä levy \n" -"\"%s\"\n" -"asemaan \"%s\" ja paina Enter\n" +msgstr "Pistä levy nimeltään: \"%s\" asemaan \"%s\" ja paina Enter." -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä" @@ -2521,91 +2530,108 @@ msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva" msgid "Error occurred while processing %s (NewPackage)" msgstr "Tapahtui virhe käsiteltäessä %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Jummijammi, annoit enemmän pakettien nimiä kuin tämä APT osaa käsitellä." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jummijammi, annoit enemmän versioita kuin tämä APT osaa käsitellä." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Jummijammi, annoit enemmän versioita kuin tämä APT osaa käsitellä." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jummijammi, annoit enemmän riippuvuuksia kuin tämä APT osaa käsitellä." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Tapahtui virhe käsiteltäessä %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakettia %s %s ei löytynyt käsiteltäessä tiedostojen riippuvuuksia." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "stat ei toiminut lähdepakettiluettelolle %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Kootaan tiedostojen tarjoamistietoja" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format 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:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "MD5Sum ei täsmää" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" -msgstr "" +msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2614,7 +2640,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:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2623,7 +2649,7 @@ msgstr "" "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan " "tämän paketin itse." -#: apt-pkg/acquire-item.cc:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2631,7 +2657,7 @@ msgstr "" "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/acquire-item.cc:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Koko ei täsmää" @@ -2640,7 +2666,7 @@ msgstr "Koko ei täsmää" msgid "Vendor block %s contains no fingerprint" msgstr "Toimittajan lohkosta %s puuttuu sormenjälki" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2649,49 +2675,51 @@ msgstr "" "Käytetään rompun liitoskohtaa %s\n" "Liitetään romppu\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Tunnistetaan... " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Tallennettu nimio: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Käytetään rompun liitoskohtaa %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Irrotetaan romppu\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Odotetaan levyä...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Liitetään romppu...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Etsitään levyltä hakemistotiedostoja...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" "Asennuspakettien hakemistoja löytyi %i, lähdekoodipakettien hakemistoja %i " "ja allekirjoituksia %i\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2700,38 +2728,38 @@ msgstr "" "Tämä levy on: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopioidaan pakettiluetteloita..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Kirjoitetaan uusi lähdeluettelo\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 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 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Irrotetaan romppu..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Kirjoitettiin %i tietuetta.\n" -#: 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 "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n" -#: 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 "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n" -#: 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 "" @@ -2739,59 +2767,69 @@ msgstr "" "tiedostoa\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "Avataan %s" +msgstr "Valmistellaan %s" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "Avataan %s" +msgstr "Puretaan %s" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "Avataan asetustiedosto %s" +msgstr "Valmistaudutaan tekemään asetukset: %s" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "Avataan yhteys %s" +msgstr "Tehdään asetukset: %s" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Asennettu: " +msgstr "%s asennettu" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "Valmistaudutaan poistamaan %s" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "Avataan %s" +msgstr "Poistetaan %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Suosittelut" +msgstr "%s poistettu" #: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#, c-format msgid "Preparing to completely remove %s" -msgstr "Avataan asetustiedosto %s" +msgstr "Valmistaudutaan poistamaan %s kokonaan" #: apt-pkg/deb/dpkgpm.cc:379 -#, fuzzy, c-format +#, c-format msgid "Completely removed %s" -msgstr "Tiedoston %s poistaminen ei onnistunut" +msgstr "%s poistettiin kokonaan" + +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Tiedostoa %s ei voitu avata" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Yhteys katkesi ennenaikaisesti" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +msgid "There is no public key available for the following key IDs:\n" +msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n" + #~ msgid "File date has changed %s" #~ msgstr "Tiedoston uusi päiväys %s" @@ -8,155 +8,165 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" -"PO-Revision-Date: 2006-05-18 09:31-0500\n" +"POT-Creation-Date: 2006-08-15 15:55+0200\n" +"PO-Revision-Date: 2006-09-02 09:59+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" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.2\n" +"X-Generator: KBabel 1.11.4\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Le paquet %s de version %s contient une dpendance absente:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Nombre total de paquets: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Paquets ordinaires: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Paquets entirement virtuels: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Paquets virtuels simples: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Paquets virtuels mixtes: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Manquants: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Nombre de versions distinctes: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Nombre de versions distinctes: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Nombre de dpendances: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Nombre de relations version/fichier: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Nombre de relations version/fichier: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Nombre de relations Provides: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Nombre de motifs rationnels: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Espace occup par les versions des dpendances: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Espace disque gaspill: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Total de l'espace attribu: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Fichier %s dsynchronis." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Vous devez fournir exactement un motif" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Aucun paquet n'a t trouv" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Fichiers du paquet:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Le cache est dsynchronis, impossible de rfrencer un fichier" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Paquets tiquets:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(non trouv)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Install: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(aucun)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Candidat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " tiquette de paquet: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Table de version:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pour %s %s est compil le %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -310,7 +320,7 @@ msgstr "" " -c=? Lit ce fichier de configuration\n" " -o=? Spcifie une option de configuration, p.ex. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Impossible d'crire sur %s" @@ -452,6 +462,8 @@ 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 @@ -548,14 +560,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " le responsable de %s est %s et non %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr "%s ne possde pas d'entre override\n" +msgstr " %s ne possde pas d'entre source override\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr "%s ne possde pas d'entre override\n" +msgstr " %s ne possde pas galement pas d'entre binary override\n" #: ftparchive/contents.cc:317 #, c-format @@ -758,114 +770,114 @@ msgstr "%lu enlever et %lu non mis jour.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu partiellement installs ou enlevs.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Correction des dpendances..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " a chou." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Impossible de corriger les dpendances" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Impossible de minimiser le nombre des paquets mis jour" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Fait" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Vous pouvez lancer apt-get -f install pour corriger ces problmes." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Dpendances manquantes. Essayez d'utiliser l'option -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ATTENTION: les paquets suivants n'ont pas t authentifis." -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Avertissement d'authentification ignor.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Faut-il installer ces paquets sans vrification (o/N)? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Certains paquets n'ont pas pu tre authentifis" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Il y a des problmes et -y a t employ sans --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erreur interne, InstallPackages appel avec des paquets casss." -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "" "Les paquets doivent tre enlevs mais la dsinstallation est dsactive." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Erreur interne. Le tri a t interrompu." -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le rpertoire de tlchargement" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "La liste des sources ne peut tre lue." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "trangement, les tailles ne correspondent pas. Veuillez le signaler par " "courriel apt@packages.debian.org." -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Il est ncessaire de prendre %so/%so dans les archives.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Il est ncessaire de prendre %so dans les archives.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Aprs dpaquetage, %so d'espace disque seront librs.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossible de dterminer l'espace disponible sur %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "L'option --trivial-only a t indique mais il ne s'agit pas d'une opration " @@ -873,11 +885,11 @@ msgstr "" # The space before the exclamation mark must not be a non-breaking space; this # sentence is supposed to be typed by a user who cannot see the difference. -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Oui, faites ce que je vous dis!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -888,28 +900,28 @@ msgstr "" "Pour continuer, tapez la phrase %s\n" "?]" -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Annulation." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Souhaitez-vous continuer [O/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de rcuprer %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu tre tlchargs." -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Tlchargement achev et dans le mode tlchargement uniquement" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -917,48 +929,48 @@ msgstr "" "Impossible de rcuprer quelques archives, peut-tre devrez-vous lancer apt-" "get update ou essayer avec --fix-missing?" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "l'option --fix-missing et l'change de support ne sont pas encore reconnus." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Impossible de corriger le fait que les paquets manquent." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Annulation de l'installation." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Note, slection de %s au lieu de %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Passe %s, il est dj install et la mise jour n'est pas prvue.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Le paquet %s n'est pas install, et ne peut donc tre supprim\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Le paquet %s est un paquet virtuel fourni par:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Install]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Vous devez explicitement slectionner un paquet installer." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -970,50 +982,50 @@ msgstr "" "devenu obsolte\n" "ou qu'il n'est disponible que sur une autre source\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Cependant les paquets suivants le remplacent:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Aucun paquet ne correspond au paquet %s" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s est dj la plus rcente version disponible.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "La version %s de %s est introuvable" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "La version %s de %s n'a pu tre trouve" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Version choisie %s (%s) pour %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "La commande de mise jour ne prend pas d'argument" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Impossible de verrouiller le rpertoire de liste" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1021,28 +1033,28 @@ msgstr "" "Le tlchargement de quelques fichiers d'index a chou, ils ont t " "ignors, ou les anciens ont t utiliss la place." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "L'information suivante devrait vous aider rsoudre la situation: " -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "" "Erreur interne, la tentative de rsolution du problme a cass certaines " "parties" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erreur interne, AllUpgrade a cass le boulot!" @@ -1592,9 +1604,9 @@ msgstr "" "fichiers" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Lecture des listes de paquets" @@ -1731,11 +1743,13 @@ msgid "File not found" msgstr "Fichier non trouv" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: methods/gzip.cc:141 methods/gzip.cc:150 msgid "Failed to stat" msgstr "Impossible de statuer" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Impossible de modifier l'heure " @@ -1865,7 +1879,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problme de hachage du fichier" @@ -1954,7 +1968,7 @@ msgstr "Impossible de se connecter %s %s:" #: 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:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." @@ -1995,86 +2009,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: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: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:375 msgid "Waiting for headers" msgstr "Attente des fichiers d'en-tte" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Mauvaise ligne d'en-tte" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 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:584 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:599 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:601 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:625 msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Slection dfaillante" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Dlai de connexion dpass" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Erreur d'criture du fichier de sortie" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Erreur d'criture sur un fichier" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Erreur d'criture sur le fichier" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Mauvais en-tte de donne" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "chec de la connexion" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Erreur interne" @@ -2087,7 +2101,7 @@ msgstr "Impossible de mapper un fichier vide en mmoire" msgid "Couldn't make mmap of %lu bytes" msgstr "Impossible de raliser un mapping de %lu octets en mmoire" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "La slection %s n'a pu tre trouve" @@ -2149,12 +2163,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fait" @@ -2286,108 +2300,110 @@ msgstr "Problme d'effacement du fichier" msgid "Problem syncing the file" msgstr "Problme de synchronisation du fichier" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cache des paquets vide" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Le fichier de cache des paquets est corrompu" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Le fichier de cache des paquets a une version incompatible" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Cet APT ne supporte pas le systme de version %s" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Le cache des paquets a t construit pour une architecture diffrente" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Dpend" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Pr-Dpend" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Suggre" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recommande" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Est en conflit avec" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Remplace" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Rend obsolte" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "ncessaire" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "optionnel" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "supplmentaire" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Construction de l'arbre des dpendances" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Versions possibles" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Gnration des dpendances" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Fusion des informations disponibles" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Impossible d'ouvrir %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Erreur d'criture du fichier %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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 "Impossible de traiter le fichier %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossible de traiter le fichier %s (2)" @@ -2424,7 +2440,7 @@ msgstr "" msgid "Opening %s" msgstr "Ouverture de %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "La ligne %u du fichier des listes de sources %s est trop longue." @@ -2517,19 +2533,19 @@ msgstr "Le pilote pour la mthode %s n'a pu tre trouv." msgid "Method %s did not start correctly" msgstr "La mthode %s n'a pas dmarr correctement" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Veuillez insrer le disque %s dans le lecteur %s et appuyez sur la " "touche Entre." -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Le systme de paquet %s n'est pas support" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Impossible de dterminer un type du systme de paquets adquat" @@ -2577,99 +2593,117 @@ msgstr "Le cache possde un systme de version incompatible" msgid "Error occurred while processing %s (NewPackage)" msgstr "Erreur apparue lors du traitement de %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Erreur apparue lors du traitement de %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Erreur apparue lors du traitement de %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Erreur apparue lors du traitement de %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Erreur apparue lors du traitement de %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Erreur apparue lors du traitement de %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Vous avez dpass le nombre de noms de paquets que cet APT est capable de " "traiter." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Vous avez dpass le nombre de versions que cet APT est capable de traiter." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Vous avez dpass le nombre de versions que cet APT est capable de traiter." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Vous avez dpass le nombre de dpendances que cet APT est capable de " "traiter." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Erreur apparue lors du traitement de %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Le paquet %s %s n'a pu tre trouv lors du traitement des dpendances des " "fichiers" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Impossible de localiser la liste des paquets sources %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Assemblage des fichiers lists dans les champs Provides" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "" "Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sources" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "impossible de changer le nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "Somme de contrle MD5 incohrente" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" msgstr "" "Aucune cl publique n'est disponible pour la/les cl(s) suivante(s):\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2679,7 +2713,7 @@ msgstr "" "sans doute que vous devrez corriger ce paquet manuellement (absence " "d'architecture)." -#: apt-pkg/acquire-item.cc:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2688,7 +2722,7 @@ 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:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2696,7 +2730,7 @@ msgstr "" "Les fichiers d'index des paquets sont corrompus. Aucun champ Filename: " "pour le paquet %s." -#: apt-pkg/acquire-item.cc:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Taille incohrente" @@ -2705,7 +2739,7 @@ msgstr "Taille incohrente" msgid "Vendor block %s contains no fingerprint" msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2714,47 +2748,49 @@ msgstr "" "Utilisation du point de montage %s pour le cdrom\n" "Montage du cdrom\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Identification..." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "tiquette stocke: %s\n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Utilisation du point de montage %s pour le cdrom\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Dmontage du cdrom\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Attente du disque...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Montage du cdrom...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Examen du disque la recherche de fichiers d'index...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation 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:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2763,38 +2799,38 @@ msgstr "" "Ce disque s'appelle:\n" "%s\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Copie des listes de paquets..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "criture de la nouvelle liste de sources\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 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 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Dmontage du cdrom..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "%i enregistrements crits.\n" -#: 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 "%i enregistrements crits avec %i fichiers manquants.\n" -#: 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 "%i enregistrements crits avec %i fichiers qui ne correspondent pas\n" -#: 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 "" @@ -2851,9 +2887,19 @@ msgstr "Prparation de la suppression complte de %s" msgid "Completely removed %s" msgstr "%s compltement supprim" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Impossible de modifier (patch) %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connexion ferme prmaturment" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +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" + #~ msgid "File date has changed %s" #~ msgstr "La date du fichier a chang %s" @@ -6,155 +6,165 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" -"PO-Revision-Date: 2006-05-11 18:09+0200\n" +"POT-Creation-Date: 2006-08-15 15:55+0200\n" +"PO-Revision-Date: 2006-09-07 11:48+0200\n" "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n" "Language-Team: Galician <trasno@ceu.fi.udc.es>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "O paquete %s versión %s ten unha dependencia incumprida:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Non se puido atopar o paquete %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Número total de nomes de paquetes : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Paquetes normais: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Paquetes virtuais puros: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Paquetes virtuais simples: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Paquetes virtuais mixtos: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Non atopados: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Número total de versións distintas: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Número total de versións distintas: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Número total de dependencias: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Número total de relacións versión/ficheiro: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Número total de relacións versión/ficheiro: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Número total de mapas de Provides: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Número total de cadeas: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Espazo total de versións de dependencias: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Espazo de reserva total: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Espazo total contabilizado: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "O ficheiro de paquete %s está sen sincronizar." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Debe fornecer exactamente un patrón" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Non se atopou ningún paquete" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Ficheiros de paquetes:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "A caché está sen sincronizar, non se pode facer referencia a un ficheiro de " "paquetes" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "[%4i] %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Paquetes inmobilizados:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(non se atopou)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Instalado: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(ningún)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Inmobilizado: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Táboa de versións:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado en %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -305,7 +315,7 @@ msgstr "" " -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Non se puido escribir en %s" @@ -448,6 +458,8 @@ msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" +"O formato da base de datos non é válido. Se actualizou desde unha versión " +"antiga de apt, elimine e volva crear a base de datos." #: ftparchive/cachedb.cc:81 #, c-format @@ -544,14 +556,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " O mantedor de %s é %s, non %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s non ten unha entrada de \"override\"\n" +msgstr " %s non ten unha entrada de \"override\" de código fonte\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s non ten unha entrada de \"override\"\n" +msgstr " %s tampouco ten unha entrada de \"override\" de binarios\n" #: ftparchive/contents.cc:317 #, c-format @@ -753,119 +765,119 @@ msgstr "%lu hanse eliminar e %lu sen actualizar.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu non instalados ou eliminados de todo.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "A corrixir as dependencias..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " fallou." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Non se puido corrixir as dependencias." -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Non se puido minimizar o xogo de actualizacións" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Rematado" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Pode querer executar \"apt-get -f install\" para corrixilos." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Dependencias incumpridas. Probe a empregar -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: ¡Non se poden autenticar os seguintes paquetes!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Ignórase o aviso de autenticación.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "¿Instalar estes paquetes sen verificación [s/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Non se puido autenticar algúns paquetes" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Houbo problemas e empregouse -y sen --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erro interno, chamouse a InstallPackages con paquetes rotos." -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Hai que eliminar paquetes pero a eliminación está desactivada." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, a ordeación non rematou" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Non se puido bloquear o directorio de descargas" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Non se puido ler a lista de orixes." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Que raro... Os tamaños non coinciden, envíe email a apt@packages.debian.org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Hai que recibir %sB/%sB de arquivos.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Hai que recibir %sB de arquivos.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Despois de desempaquetar hanse ocupar %sB de disco adicionais.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Despois de desempaquetar hanse liberar %sB de disco.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "Non se puido determinar o espazo libre en %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, 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:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Especificouse \"Só Triviais\" pero esta non é unha operación trivial." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "¡Si, fai o que digo!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -876,28 +888,28 @@ msgstr "" "Para continuar escriba a frase \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Abortar." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "¿Quere continuar [S/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Non se puido obter %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Non se puido descargar algúns ficheiros" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Completouse a descarga no modo de só descargas" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -905,49 +917,49 @@ msgstr "" "Non se puido obter algúns arquivos; probe con apt-get update ou --fix-" "missing." -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "O emprego conxunto de --fix-missing e intercambio de discos non está " "soportado" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Non se puido corrixir os paquetes non dispoñibles." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "A abortar a instalación." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, escóllese %s no canto de %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Omítese %s, xa está instalado e non se especificou a actualización.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "O paquete %s non está instalado, así que non se eliminou\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O paquete %s é un paquete virtual fornecido por:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Debería escoller un para instalar." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -958,49 +970,49 @@ msgstr "" "Isto pode significar que o paquete falla, está obsoleto ou só está\n" "dispoñible noutra fonte.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Nembargantes, os seguintes paquetes substitúeno:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "O paquete %s non ten un candidato para a instalación" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "A reinstalación de %s non é posible, non se pode descargar.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s xa é a versión máis recente.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Non se atopou a versión \"%s\" de \"%s\"" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Non se atopou a versión \"%s\" de \"%s\"" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Escolleuse a versión %s (%s) de %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "A orde \"update\" non toma argumentos" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Non se puido bloquear o directorio de listas" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1008,26 +1020,26 @@ msgstr "" "Non se puido descargar algúns ficheiros de índices; ignoráronse ou " "empregáronse uns vellos no seu lugar." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "A seguinte información pode axudar a resolver a situación:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Erro interno, o resolvedor interno rompeu cousas" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro interno, AllUpgrade rompeu cousas" @@ -1568,9 +1580,9 @@ msgstr "" "Os directorios info e temp teñen que estar no mesmo sistema de ficheiros" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "A ler as listas de paquetes" @@ -1703,11 +1715,13 @@ 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/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: 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/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Non se puido estabrecer a hora de modificación" @@ -1836,7 +1850,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" @@ -1964,86 +1978,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: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: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:375 msgid "Waiting for headers" msgstr "A agardar polas cabeceiras" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Liña de cabeceira incorrecta" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 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:584 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:599 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:601 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:625 msgid "Unknown date format" msgstr "Formato de data descoñecido" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Fallou a chamada a select" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "A conexión esgotou o tempo" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Erro ao escribir no ficheiro de saída" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Erro ao escribir nun ficheiro" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Erro ao escribir no ficheiro" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Erro ao ler do servidor" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Datos da cabeceira incorrectos" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "A conexión fallou" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Erro interno" @@ -2056,7 +2070,7 @@ msgstr "Non se pode facer mmap sobre un ficheiro baleiro" msgid "Couldn't make mmap of %lu bytes" msgstr "Non se puido facer mmap de %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Non se atopou a selección %s" @@ -2116,12 +2130,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Rematado" @@ -2254,108 +2268,110 @@ msgstr "Problema ao borrar o ficheiro" msgid "Problem syncing the file" msgstr "Problema ao sincronizar o ficheiro" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Caché de paquetes baleira" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "O ficheiro de caché de paquetes está corrompido" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "O ficheiro de caché de paquetes é unha versión incompatible" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Este APT non soporta o sistema de versionamento \"%s\"" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "A caché de paquetes construiuse para unha arquitectura diferente" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "PreDepende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Suxire" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recomenda" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Conflicto con" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Substitúe a" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Fai obsoleto a" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "requirido" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "estándar" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "A construír a árbore de dependencias" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Versións candidatas" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Xeración de dependencias" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "A mesturar a información sobre paquetes dispoñibles" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Non se puido abrir %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Non se puido gravar o ficheiro %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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: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)" @@ -2390,7 +2406,7 @@ msgstr "Liña %lu mal formada na lista de fontes %s (análise de dist)" msgid "Opening %s" msgstr "A abrir %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Liña %u longa de máis na lista de fontes %s." @@ -2477,17 +2493,17 @@ msgstr "Non se puido atopar o controlador de métodos %s." msgid "Method %s did not start correctly" msgstr "O método %s non se iniciou correctamente" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Introduza o disco etiquetado: \"%s\" na unidade \"%s\" e prema Intro." -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "O sistema de empaquetamento \"%s\" non está soportado" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Non se puido determinar un tipo de sistema de empaquetamento axeitado" @@ -2534,91 +2550,108 @@ msgstr "A caché ten un sistema de versionamento incompatible" msgid "Error occurred while processing %s (NewPackage)" msgstr "Ocorreu un erro ao procesar %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Ocorreu un erro ao procesar %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Ocorreu un erro ao procesar %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Ocorreu un erro ao procesar %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Ocorreu un erro ao procesar %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Ocorreu un erro ao procesar %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Ocorreu un erro ao procesar %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Ocorreu un erro ao procesar %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Ocorreu un erro ao procesar %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Guau, superou o número de nomes de paquetes que este APT pode manexar." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Guau, superou o número de versións que este APT pode manexar." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Guau, superou o número de versións que este APT pode manexar." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Guau, superou o número de dependencias que este APT pode manexar." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Ocorreu un erro ao procesar %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Ocorreu un erro ao procesar %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Non se atopou o paquete %s %s ao procesar as dependencias de ficheiros" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Non se atopou a lista de paquetes fonte %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "A recoller as provisións de ficheiros" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "Erro de E/S ao gravar a caché de fontes" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format 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:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "Os MD5Sum non coinciden" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" msgstr "" "Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2627,7 +2660,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:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2636,7 +2669,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:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2644,7 +2677,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:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Os tamaños non coinciden" @@ -2653,7 +2686,7 @@ msgstr "Os tamaños non coinciden" msgid "Vendor block %s contains no fingerprint" msgstr "O bloque de provedor %s non contén unha pegada dixital" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2662,48 +2695,50 @@ msgstr "" "A empregar o punto de montaxe de CD-ROMs %s\n" "A montar o CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "A identificar.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Etiqueta armacenada: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "A empregar o punto de montaxe de CD-ROMs %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "A desmontar o CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "A agardar polo disco...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "A montar o CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "A buscar os ficheiros de índices no disco..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation 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:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2712,38 +2747,38 @@ msgstr "" "Este disco chámase: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "A copiar as listas de paquetes..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "A gravar a nova lista de fontes\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 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 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "A desmontar o CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Graváronse %i rexistros.\n" -#: 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 "Graváronse %i rexistros con %i ficheiros que fallan.\n" -#: 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 "Graváronse %i rexistros con %i ficheiros que non coinciden\n" -#: 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 "" @@ -2800,10 +2835,21 @@ msgstr "A se preparar para eliminar %s completamente" msgid "Completely removed %s" msgstr "Eliminouse %s completamente" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Non se puido abrir o ficheiro %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "A conexión pechouse prematuramente" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +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" + #~ msgid "File date has changed %s" #~ msgstr "A data do ficheiro cambiou %s" @@ -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: 2006-08-15 15:55+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" @@ -15,145 +15,153 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "לחבילה %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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "לא מצליח לאתר את החבילה %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr "חבילות נורמליות:" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr "חבילות וירטואליות לחלוטין:" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr "חסרות:" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +msgid "Total Distinct Descriptions: " +msgstr "" + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +msgid "Total Desc/File relations: " +msgstr "" + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "קובץ החבילה %s לא מסונכרן." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "אתה חייב לתת בדיוק תבנית אחת" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "לא נמצאו חבילות" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "קבצי חבילה:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "חבילות נעוצות:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(לא נמצא)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr "מותקן:" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(none)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr "מועמדים:" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr "נעץ חבילה:" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2462 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:1715 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:817 #, c-format msgid "Unable to write to %s" msgstr "לא מצליח לכתוב ל-%s" @@ -327,115 +335,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" @@ -531,79 +550,79 @@ msgstr "" msgid "Failed to rename %s to %s" msgstr "כשלון בשינוי השם %s ל-%s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574 #, 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 "אבל %s מותקנת" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "אבל %s הולכת להיות מותקנת" -#: 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 "%s (בגלל %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -612,144 +631,144 @@ msgstr "" "א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n" "על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu משודרגים, %lu מותקנים חדשים, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu מותקנות מחדש, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu משודרגות מטה, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu יוסרו ו-%lu לא ישודרגו.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu לא מותקנות לחלוטין או הוסרו.\n" -#: 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 "אולי תרצה להריץ 'apt-get -f install' כדי לתקן את אלו." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "תלויות שלא נענו. נסה להשתמש באפשרות -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 #, fuzzy 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 "היו בעיות והאפשרות -y היתה בשימוש ללא האפשרות --force-yes" -#: 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:1809 cmdline/apt-get.cc:1842 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 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:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: 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 "צריך לקבל %sB/%sB מתוך הארכיונים.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "צריך לקבל %sB מתוך הארכיונים.\n" -#: 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 "אחרי פריסה %sB נוספים יהיו בשימוש.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format 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:861 cmdline/apt-get.cc:2064 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "אין לך מספיק מקום פנוי ב-%s." -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "אין לך מספיק מקום פנוי ב-%s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc: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" @@ -757,75 +776,75 @@ 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 #, fuzzy 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:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "כשלון בהבאת %s %s\n" -#: 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:2032 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 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" @@ -833,79 +852,98 @@ 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:1420 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1401 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:1415 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1440 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 +msgid "The following information may help to resolve the situation:" +msgstr "" + +#: cmdline/apt-get.cc:1447 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "שגיאה פנימית, כלשון ביצירת %s" + +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1525 +#: cmdline/apt-get.cc:1584 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1555 +#: cmdline/apt-get.cc:1614 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1558 +#: cmdline/apt-get.cc:1617 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:1629 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 +951,160 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1578 +#: cmdline/apt-get.cc:1637 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 -msgid "The following information may help to resolve the situation:" -msgstr "" - -#: cmdline/apt-get.cc:1586 +#: cmdline/apt-get.cc:1645 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1612 +#: cmdline/apt-get.cc:1676 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1765 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1684 +#: cmdline/apt-get.cc:1766 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1786 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1712 +#: cmdline/apt-get.cc:1794 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785 +#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "שגיאה פנימית, כלשון ביצירת %s" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1969 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:1999 cmdline/apt-get.cc:2228 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:2043 #, 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:2067 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:2072 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1991 +#: cmdline/apt-get.cc:2075 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2081 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2028 +#: cmdline/apt-get.cc:2112 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2152 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2069 +#: cmdline/apt-get.cc:2153 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2086 +#: cmdline/apt-get.cc:2170 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:2189 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2121 +#: cmdline/apt-get.cc:2205 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2149 +#: cmdline/apt-get.cc:2233 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2169 +#: cmdline/apt-get.cc:2253 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2221 +#: cmdline/apt-get.cc:2305 #, 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:2357 #, 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:2392 #, 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:2417 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2347 +#: cmdline/apt-get.cc:2431 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2351 +#: cmdline/apt-get.cc:2435 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2383 +#: cmdline/apt-get.cc:2467 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2508 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1198,19 +1232,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 "" @@ -1355,9 +1389,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "" @@ -1371,7 +1405,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 +1449,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" @@ -1490,12 +1520,14 @@ msgstr "(לא נמצא)" msgid "File not found" msgstr "" -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: 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:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "" @@ -1621,7 +1653,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1644,7 +1676,7 @@ msgstr "" msgid "Query" msgstr "" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "" @@ -1673,155 +1705,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:57 methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "" -#: methods/gzip.cc:102 +#: methods/gzip.cc:102 methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "" -#: methods/http.cc:381 +#: methods/http.cc:375 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:527 +#: methods/http.cc:521 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:535 +#: methods/http.cc:529 msgid "Bad header line" msgstr "" -#: methods/http.cc:554 methods/http.cc:561 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:590 +#: methods/http.cc:584 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:605 +#: methods/http.cc:599 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:607 +#: methods/http.cc:601 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:631 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "" -#: methods/http.cc:778 +#: methods/http.cc:772 msgid "Select failed" msgstr "" -#: methods/http.cc:783 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "" -#: methods/http.cc:806 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:837 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "" -#: methods/http.cc:865 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:879 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:881 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1112 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "" -#: methods/http.cc:1129 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "" -#: methods/http.cc:1220 +#: methods/http.cc:1214 msgid "Internal error" msgstr "" @@ -1834,7 +1867,7 @@ msgstr "" msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "" @@ -1894,12 +1927,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "" @@ -2031,93 +2064,109 @@ msgstr "" msgid "Problem syncing the file" msgstr "" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 +msgid "Reading state information" +msgstr "" + +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "כשלון בפתיחת %s" + +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "כשלון בפענוח %s" + +#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" @@ -2152,7 +2201,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:450 #, c-format msgid "Line %u too long in source list %s." msgstr "" @@ -2185,19 +2234,19 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1059 +#: apt-pkg/algorithms.cc:1075 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1061 +#: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." msgstr "" @@ -2211,9 +2260,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:823 #, c-format -msgid "Downloading file %li of %li (%s remaining)" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "" + +#: apt-pkg/acquire.cc:825 +#, c-format +msgid "Retrieving file %li of %li" msgstr "" #: apt-pkg/acquire-worker.cc:113 @@ -2231,12 +2287,12 @@ msgstr "" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2270,115 +2326,134 @@ msgstr "" msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:157 +#, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:249 +#, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:261 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:719 +#: apt-pkg/acquire-item.cc:1097 +msgid "There are no public key available for the following key IDs:\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:1210 #, 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:1269 #, 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:1305 #, 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:1392 msgid "Size mismatch" msgstr "" @@ -2387,92 +2462,94 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:673 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "" -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -2519,14 +2596,25 @@ msgstr "" #: apt-pkg/deb/dpkgpm.cc:378 #, c-format -msgid "Preparing for remove with config %s" +msgid "Preparing to completely remove %s" msgstr "" #: apt-pkg/deb/dpkgpm.cc:379 #, c-format -msgid "Removed with config %s" +msgid "Completely removed %s" +msgstr "" + +#: methods/rred.cc:219 +msgid "Could not patch file" msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "" + +#: apt-pkg/acquire-item.cc:1097 +msgid "There is no public key available for the following key IDs:\n" +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-08-09 23: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: 2006-08-15 15:55+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" @@ -19,146 +19,154 @@ msgstr "" "X-Poedit-Language: Hungarian\n" "X-Poedit-Country: HUNGARY\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "%s csomag %s verziójának teljesítetlen függősége van:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Az alábbi csomag nem található: %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Csomagnevek összesen : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Normális csomagok: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Teljesen virtuális csomagok: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Egyedi virtuális csomagok: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Vegyes virtuális csomagok: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Hiányzik: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Különböző verziók összesen: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +msgid "Total Distinct Descriptions: " +msgstr "Összes külső leírás: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Függőségek összesen: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Verzió/Fájl kapcsolatok összesen: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +msgid "Total Desc/File relations: " +msgstr "Összes Leírás/Fájl kapcsolat: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "\"Előkészít\" kapcsolatok összesen: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Minták összesen: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Függőségi-verzió terület összesen: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Slack terület összesen: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Terület összesen: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "%s csomag fájl szinkronon kívül." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Pontosan egy mintát kell megadnod" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Nem találtam csomagokat" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Csomagfájlok:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "A gyorsítótár nincs szinkronban, nem lehet kereszthivatkozni a csomag fájlra" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Rögzített csomagok:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(nem találtam)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Telepítve: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(nincs)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Jelölt: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Csomag Tű: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Verziótáblázat:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s ehhez: %s %s fordítás ideje: %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -305,7 +313,7 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Nem lehet írni ebbe: %s" @@ -444,6 +452,8 @@ 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 @@ -540,14 +550,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " %s karbantartója %s, nem %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n" +msgstr " %s nem rendelkezik forrás felülbíráló bejegyzéssel\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n" +msgstr " %s nem rendelkezik bináris felülbíráló bejegyzéssel sem\n" #: ftparchive/contents.cc:317 #, c-format @@ -749,118 +759,118 @@ msgstr "%lu eltávolítandó és %lu nem frissített.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Függőségek javítása..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " sikertelen." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Nem lehet javítani a függőségeket" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Kész" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Ezek kijavításához próbáld futtatni az 'apt-get -f install'-t ." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Teljesítetlen függőségek. Próbáld a -f használatával." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "FIGYELEM: Az alábbi csomagok nem hitelesíthetők!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "A hitelesítési figyelmeztetést átléptem.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Valóban telepíted e csomagokat ellenőrzés nélkül (i/N)? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Néhány csomag nem hitelesíthető" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Problémák vannak és a -y -t használtad --force-yes nélkül" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyezett." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Belső hiba, a rendezés nem zárult" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Nem tudom zárolni a letöltési könyvtárat" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A források listája olvashatatlan." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Ez durva... A méretek nem egyeznek, írj ide:apt@packages.debian.org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Letöltendő az archívumokból: %sB/%sB\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Letöltés az archívumokból: %sB\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Kicsomagolás után %sB lemezterületet használok fel\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Kicsomagolás után %sB lemezterület szabadul fel.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nem határozható meg a szabad hely itt: %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Nincs elég szabad hely itt: %s." -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "A 'Trivial Only' meg van adva, de ez nem egy triviális művelet." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Igen, tedd amit mondok!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -871,28 +881,28 @@ msgstr "" "A folytatáshoz írd be ezt: '%s'\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Megszakítva." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarod [Y/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "A letöltés befejeződött a 'csak letöltés' módban" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -900,47 +910,47 @@ msgstr "" "Nem lehet letölteni néhány archívumot.\n" " Próbáld ki az apt-get update -et vagy a --fix-missing -et." -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing és média csere jelenleg nem támogatott" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Nem lehet javítani a hiányzó csomagokat." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Telepítés megszakítása." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Megjegyzés: %s kiválasztása %s helyett\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s kihagyása, ez már telepítve van és a frissítés nincs beállítva.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "A megadott %s csomag nincs telepítve, így hát nem is töröltem\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s egy virtuális csomag, melyet az alábbi csomagok adnak:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Telepítve]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Egyet név szerint ki kell jelölnöd a telepítésre." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -950,49 +960,49 @@ msgstr "" "%s csomag nem elérhető, de egy másik hivatkozik rá\n" ".A kért csomag tehát: hiányzik, elavult vagy csak más forrásból érhető el\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "De az alábbi csomagok felváltják:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "%s csomagnak nincs e telepítéshez kijelölhető változata" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s már a legújabb verzió.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%s' kiadás ehhez: '%s' nem található" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%s' verzió ehhez: '%s' nem található" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Nem tudom a listakönyvtárat zárolni" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1000,26 +1010,26 @@ msgstr "" "Néhány index fájl letöltése meghiúsult, ezeket mellőzöm vagy régi " "változatukat használom." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "Az alábbi információ segíthet megoldani a helyzetet:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Belső hiba, hibafeloldó gond" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Belső hiba, AllUpgrade megsértett valamit" @@ -1556,9 +1566,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Az info és temp könyvtáraknak egy fájlrendszeren kell lenniük" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Csomaglisták olvasása" @@ -1692,11 +1702,13 @@ msgid "File not found" msgstr "Nem találom a fájlt" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: methods/gzip.cc:141 methods/gzip.cc:150 msgid "Failed to stat" msgstr "Nem érhető el" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "A módosítási időt beállítása sikertelen" @@ -1824,7 +1836,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" @@ -1946,86 +1958,86 @@ msgid "" 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: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: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:375 msgid "Waiting for headers" msgstr "Várakozás a fejlécekre" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Rossz fejléc sor" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 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:584 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:599 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:601 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:625 msgid "Unknown date format" msgstr "Ismeretlen dátum formátum" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Sikertelen kiválasztás" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Hiba fájl írásakor" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Rossz fejlécadat" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Sikertelen kapcsolódás" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Belső hiba" @@ -2039,7 +2051,7 @@ msgstr "Nem lehet mmap-olni egy üres fájlt" msgid "Couldn't make mmap of %lu bytes" msgstr "Nem sikerült %lu bájtot mmap-olni" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "%s kiválasztás nem található" @@ -2099,12 +2111,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Kész" @@ -2237,108 +2249,110 @@ msgstr "Hiba a fájl leválasztásával" msgid "Problem syncing the file" msgstr "Hiba a fájl szinkronizálásakor" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Üres csomag-gyorstár" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "A csomag-gyorstár fájl megsérült" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "A csomag-gyorstár fájl inkompatibilis verziójú" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Ez az APT nem támogatja a(z) '%s' verziórendszert" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "A csomag-gyorstár egy másik architektúrához készült" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Függ ettől" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Függ ettől (előfüggés)" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Javasolja" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Ajánlja" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Ütközik" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Kicseréli" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Elavulttá teszi" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "fontos" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "szükséges" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "szabványos" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcionális" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Függőségi fa építése" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Lehetséges verziók" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Függőség-generálás" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Elérhető információk egyesítése" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "%s megnyitása sikertelen" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "%s fájl írása sikertelen" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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 "Nem lehet a(z) %s csomagfájlt feldolgozni (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 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)" @@ -2373,7 +2387,7 @@ msgstr "A(z) %lu. sor hibás %s forráslistában (dist feldolgozó)" msgid "Opening %s" msgstr "%s megnyitása" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "A(z) %u. sor túl hosszú %s forráslistában." @@ -2461,17 +2475,17 @@ msgstr "A(z) %s metódus vezérlő nem található." msgid "Method %s did not start correctly" msgstr "A(z) %s metódus nem indult el helyesen" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Tedd be a(z) %s címkéjű lemezt a(z) %s meghajtóba és üss entert" -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "A(z) '%s' csomagrendszer nem támogatott" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "A megfelelő csomagrendszer típus nem határozható meg" @@ -2515,95 +2529,112 @@ msgstr "A gyorsítótárnak inkompatibilis verziórendszere van" msgid "Error occurred while processing %s (NewPackage)" msgstr "Hiba történt %s feldolgozásakor (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Hiba történt %s feldolgozásakor (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Hiba történt %s feldolgozásakor (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Hiba történt %s feldolgozásakor (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Hiba történt %s feldolgozásakor (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Hiba történt %s feldolgozásakor (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Hiba történt %s feldolgozásakor (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Hiba történt %s feldolgozásakor (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Hiba történt %s feldolgozásakor (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Ez nem semmi, túllépted a csomagnevek számát, amit ez az APT kezelni tud!" -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Ez nem semmi, túllépted a csomagverziók számát, amit ez az APT kezelni tud!" -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Ez nem semmi, túllépted a csomagleírások számát, amit ez az APT kezelni tud!" + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Ez nem semmi, túllépted a függőségek számát, amit ez az APT kezelni tud." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Hiba történt %s feldolgozásakor (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Hiba történt %s feldolgozásakor (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "%s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása közben" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni" # FIXME -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "\"Előkészít\" kapcsolatok összegyűjtése" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "IO hiba a forrás-gyorsítótár mentésekor" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "sikertelen átnevezés, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "Az MD5Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2612,7 +2643,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:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2621,14 +2652,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:854 +#: apt-pkg/acquire-item.cc:1305 #, 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:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "A méret nem megfelelő" @@ -2637,7 +2668,7 @@ msgstr "A méret nem megfelelő" msgid "Vendor block %s contains no fingerprint" msgstr "A(z) %s terjesztő blokk nem tartalmaz ujjlenyomatot" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2646,47 +2677,49 @@ msgstr "" "%s CD-ROM csatolási pont használata\n" "CD-ROM csatolása\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Azonosítás.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Tárolt címke: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "%s CD-ROM csatolási pont használata\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM leválasztása\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Várakozás a lemezre...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM felcsatolása...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Indexfájlok keresése a lemezen...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation 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:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2695,38 +2728,38 @@ msgstr "" "E lemez neve: \n" "%s\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Csomaglisták másolása..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Új forráslista írása\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 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 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "CD-ROM leválasztása..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "%i rekord kiírva.\n" -#: 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 "%i rekord kiírva, %i hiányzó fájllal.\n" -#: 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 "%i rekord kiírva %i hibásan párosított fájllal\n" -#: 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 "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n" @@ -2781,41 +2814,30 @@ msgstr "%s teljes eltávolítása előkészítése" msgid "Completely removed %s" msgstr "%s teljesen eltávolítva" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "%s fájl foltozása sikertelen" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "A kapcsolat idő előtt lezárult" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +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" + #~ 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: " - -#~ msgid "Total Desc/File relations: " -#~ msgstr "Összes Leírás/Fájl kapcsolat: " - #~ msgid "Reading file list" #~ msgstr "Fájllista olvasása" #~ msgid "Could not execute " #~ msgstr "Nem futtatható" -#~ msgid "Error occured while processing %s (NewFileDesc1)" -#~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc1)" - -#~ msgid "Error occured while processing %s (NewFileDesc2)" -#~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc2)" - -#~ msgid "Wow, you exceeded the number of descriptions this APT is capable of." -#~ msgstr "" -#~ "Ez nem semmi, túllépted a csomagleírások számát, amit ez az APT kezelni " -#~ "tud!" - #~ msgid "Preparing for remove with config %s" #~ msgstr "Előkészítés eltávolításhoz %s konfigurálásával" #~ msgid "Removed with config %s" #~ msgstr "%s konfigurálásával eltávolítva" - -#~ msgid "Could not patch file" -#~ msgstr "%s fájl foltozása sikertelen" @@ -5,154 +5,164 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" -"PO-Revision-Date: 2006-02-14 11:41+0100\n" +"POT-Creation-Date: 2006-08-15 15:55+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" "Content-Type: text/plain; charset=iso-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Il pacchetto %s, versione %s, ha una dipendenza non soddisfatta:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Impossibile trovare il pacchetto %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Totale nomi dei pacchetti : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Pacchetti normali: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Pacchetti virtuali puri: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Pacchetti virtuali singoli: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Pacchetti virtuali misti: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Mancante: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Totale versioni distinte: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Totale versioni distinte: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Totale dipendenze: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Totale relazioni ver/file: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Totale relazioni ver/file: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Totale corrispondenze fornite: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Totale stringhe globalizzate: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Totale spazio di dipendenza di versione: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Totale spazio \"slack\": " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Totale spazio occupato: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Il file dei pacchetti %s non sincronizzato." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Bisogna specificare un singolo pattern" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Nessun pacchetto trovato" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "File dei pacchetti:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "La cache non sincronizzata, impossibile referenziare un file di pacchetti" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Pacchetti con pin:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(non trovato)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Installato: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(nessuno)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Pin del pacchetto: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Tabella versione:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s per %s %s compilato il %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -203,7 +213,7 @@ msgstr "" " gencaches - Costruisce sia la cache dei pacchetti che dei sorgenti\n" " showpkg - Mostra informazioni generali per un singolo pacchetto\n" " showsrc - Mostra i campi dei sorgenti\n" -" stats - Mostra alcune statisitiche di base\n" +" stats - Mostra alcune statistiche di base\n" " dump - Mostra il file in forma compatta\n" " dumpavail - Stampa un file \"available\" in stdout\n" " unmet - Mostra le dipendenze non soddisfatte\n" @@ -302,7 +312,7 @@ msgstr "" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Impossibile scrivere in %s" @@ -441,6 +451,8 @@ 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 @@ -534,17 +546,17 @@ msgstr " %s non ha un campo override\n" #: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" -msgstr " %s mantainer %s non %s\n" +msgstr " %s maintainer %s non %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s non ha un campo override\n" +msgstr " %s non ha un campo source override\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s non ha un campo override\n" +msgstr " %s non ha neppure un campo binary override\n" #: ftparchive/contents.cc:317 #, c-format @@ -747,124 +759,124 @@ msgstr "%lu da rimuovere e %lu non aggiornati.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu non completamente installati o rimossi.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Correzione delle dipendenze in corso..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " fallita." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Impossibile correggere le dipendenze" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Impossibile minimizzare l'insieme da aggiornare" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Fatto" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" " consigliabile eseguire `apt-get -f install' per correggere questi problemi." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Dipendenze non trovate. Riprovare usando -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Avviso di autenticazione disabilitato \n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Installare questi pacchetti senza la verifica [s/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Non stato possibile autenticare alcuni pacchetti" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Sussistono dei problemi e -y stata usata senza --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Errore interno, InstallPackages stato chiamato con un pacchetto rotto!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "I pacchetti devono essere rimossi ma il remove disabilitato." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Errore interno, l'ordinamento non terminato" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Impossibile creare un lock sulla directory di download" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "La lista dei sorgenti non pu essere letta." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Che strano... le dimensioni non corrispondono, inviare un'email a " "apt@packages.debian.org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr " necessario prendere %sB/%sB di archivi. \n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr " necessario prendere %sB di archivi. \n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Dopo l'estrazione, verranno occupati %sB di spazio su disco.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Dopo l'estrazione, verranno liberati %sB di spazio su disco.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossibile determinare lo spazio libero su %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." -msgstr "Lo spazio libero in %s non sufficente." +msgstr "Lo spazio libero in %s non sufficiente." -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" " stata specificata la modalit Trivial Only ma questa non un'operazione " "triviale" -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "SI, esegui come richiesto!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -875,28 +887,28 @@ msgstr "" "Per continuare scrivere la frase '%s' \n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Interrotto." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Continuare [S/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile ottenere %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Il download di alcuni file fallito" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Download completato e in modalit download-only" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -904,49 +916,49 @@ msgstr "" "Impossibile prendere alcuni archivi, forse meglio eseguire apt-get update " "o provare l'opzione --fix-missing" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing su media estraibili non ancora supportato" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Impossibile correggere i pacchetti mancanti" -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Interruzione dell'installazione in corso." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, si sta selezionando %s al posto di %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s stato saltato, perch gi installato e l'aggiornamento non stato " "impostato.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Il pacchetto %s non installato, quindi non stato rimosso\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Il pacchetto %s un pacchetto virtuale fornito da:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Installato]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Bisogna esplicitamente sceglierne uno da installare." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -957,49 +969,49 @@ msgstr "" "pacchetto. Questo significa che il pacchetto manca, diventato obsoleto\n" "o disponibile solo all'interno di un'altra sorgente\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Comunque il seguente pacchetto lo sostituisce:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Il pacchetto %s non ha candidati da installare" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "La reinstallazione di %s non possibile, non pu essere scaricato.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s gi alla versione pi recente.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Non stata trovata la release '%s' per '%s'" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Non stata trovata la versione '%s' per '%s'" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versione selezionata %s (%s) per %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Il comando update non accetta argomenti" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Impossibile creare un lock sulla directory di list" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1007,26 +1019,26 @@ msgstr "" "Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure " "si useranno quelli precedenti." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: " -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Errore interno, problem resolver ha rotto qualcosa" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Errore interno, AllUpgrade ha rotto qualcosa" @@ -1124,7 +1136,7 @@ msgstr "Si saltato il file gi scaricato '%s'\n" #: cmdline/apt-get.cc:2067 #, c-format msgid "You don't have enough free space in %s" -msgstr "Lo spazio libero in %s non sufficente" +msgstr "Lo spazio libero in %s non sufficiente" #: cmdline/apt-get.cc:2072 #, c-format @@ -1575,9 +1587,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Le directory temp e info devono essere sullo stesso filesystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Lettura della lista dei pacchetti in corso" @@ -1711,11 +1723,13 @@ msgid "File not found" msgstr "File non trovato" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: methods/gzip.cc:141 methods/gzip.cc:150 msgid "Failed to stat" msgstr "Impossibile analizzare" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Impossibile impostare la data di modifica (modification time)" @@ -1771,7 +1785,7 @@ msgstr "TYPE fallito, il server ha detto: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" -msgstr "Timeout della connesione" +msgstr "Timeout della connessione" #: methods/ftp.cc:335 msgid "Server closed the connection" @@ -1844,7 +1858,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemi nella creazione dell'hash del file" @@ -1917,7 +1931,7 @@ msgstr "Impossibile risolvere '%s'" #: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "risoluzione di '%s' temporaneamete fallita" +msgstr "risoluzione di '%s' temporaneamente fallita" #: methods/connect.cc:176 #, c-format @@ -1930,9 +1944,9 @@ msgid "Unable to connect to %s %s:" msgstr "Impossibile connettersi a %s %s:" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Impossibile risolvere '%s'" +msgstr "Impossibile accedere al keyring '%s'" #: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." @@ -1951,9 +1965,10 @@ msgid "At least one invalid signature was encountered." msgstr "Almeno una firma non valida stata trovata." #: methods/gpgv.cc:213 -#, fuzzy, c-format +#, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr " per verificare la firma (gnugp installato?)" +msgstr "" +"Impossibile esseguire '%s' per verificare la firma (gnupg installato?)" #: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" @@ -1968,90 +1983,90 @@ msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -"Le seguenti firme non sono state verificate perch la chiave pubblica non " +"Le seguenti firme non sono state verificate perch la chiave pubblica non " "disponibile:\n" -#: methods/gzip.cc:57 +#: 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: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:375 msgid "Waiting for headers" msgstr "In attesa degli header" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Linea nell'header non corretta" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 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:584 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:599 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:601 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:625 msgid "Unknown date format" msgstr "Formato della data sconosciuto" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Select fallito" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Tempo limite per la connessione esaurito" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Errore nella scrittura del file di output" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Errore nella lettura dal server" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Header dei dati malformato" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Connessione fallita" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Errore interno" @@ -2064,7 +2079,7 @@ msgstr "Impossibile eseguire mmap su un file vuoto" msgid "Couldn't make mmap of %lu bytes" msgstr "Impossibile eseguire mmap di %lu byte" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Selezione %s non trovata" @@ -2126,12 +2141,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fatto" @@ -2265,109 +2280,111 @@ msgstr "Si verificato un problema rimuovendo il file" msgid "Problem syncing the file" msgstr "Si verificato un problema sincronizzando il file" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cache dei pacchetti vuota" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Il file cache dei pacchetti corrotto" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Il file cache dei pacchetti in una versione incompatibile" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Questo APT non supporta il sistema di versioning '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "" "Il file cache dei pacchetti stato generato per un'architettura differente" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Dipende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Predipende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Consiglia" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Raccomanda" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Va in conflitto" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Sostituisce" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Rende obsoleto" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "richiesto" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opzionale" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Generazione dell'albero delle dipendenze in corso" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Versioni candidate" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Generazione delle dipendenze" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Aggiornamento delle informazioni disponibili" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Impossibile aprire %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Impossibile scrivere il file %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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 "Impossibile analizzare il file dei pacchetti %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossibile analizzare il file dei pacchetti %s (2)" @@ -2402,7 +2419,7 @@ msgstr "La linea %lu in %s (dist parse) non corretta" msgid "Opening %s" msgstr "Apertura di %s in corso" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Linea %u troppo lunga nel source list %s." @@ -2471,14 +2488,14 @@ 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 +#, 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 +#, 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 @@ -2490,19 +2507,19 @@ msgstr "Non stato possibile trovare un driver per il metodo %s." msgid "Method %s did not start correctly" msgstr "Il metodo %s non partito correttamente" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Per favore inserire il disco chiamato '%s' nel dispositivo '%s' e premere " "invio." -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Il sistema di archiviazione (packaging) '%s' non supportato" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti" @@ -2546,98 +2563,117 @@ msgstr "La cache ha un sistema incompatibile di gestione delle versioni" msgid "Error occurred while processing %s (NewPackage)" msgstr "Errore nell'analisi di %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Errore nell'analisi di %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Errore nell'analisi di %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Errore nell'analisi di %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Errore nell'analisi di %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Errore nell'analisi di %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Errore nell'analisi di %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Errore nell'analisi di %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Errore nell'analisi di %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "WOW, si ecceduto il numero massimo di nomi di pacchetti che questo APT " "capace di gestire" -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "WOW, si ecceduto il numero massimo di versioni che questo APT capace di " "gestire" -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"WOW, si ecceduto il numero massimo di versioni che questo APT capace di " +"gestire" + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "WOW, si ecceduto il numero massimo di dipendenze che questo APT capace " "di gestire" -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Errore nell'analisi di %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Errore nell'analisi di %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" " stato impossibile trovare %s %s mentre si processava le dipendenze dei file" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Impossibile controllare la lista dei pacchetti sorgente %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Il File Collezionato Fornisce" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "Errore di I/O nel salvataggio del cache sorgente" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "rename() fallita: %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "Somma MD5 non corrispondente" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" msgstr "" "Non esiste una chiave pubblica disponibile per i seguenti ID di chiave:\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2647,7 +2683,7 @@ msgstr "" "che bisogna correggere manualmente l'errore. (a causa di un'architettura " "mancante)" -#: apt-pkg/acquire-item.cc:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2656,7 +2692,7 @@ msgstr "" "Non stato possibile trovare file per il pacchetto %s. Questo significa che " "bisogna correggere manualmente l'errore." -#: apt-pkg/acquire-item.cc:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2664,7 +2700,7 @@ msgstr "" "I file indice dei pacchetti sono corrotti. Non c' un campo Filename: per il " "pacchetto %s." -#: apt-pkg/acquire-item.cc:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Le Dimensioni non corrispondono" @@ -2673,7 +2709,7 @@ msgstr "Le Dimensioni non corrispondono" msgid "Vendor block %s contains no fingerprint" msgstr "Il blocco vendor %s non contiene dati" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2682,47 +2718,49 @@ msgstr "" "Si user il punto di montaggio del CD-ROM %s\n" "Montaggio CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Identificazione in corso.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Etichette salvate: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Si user il mount point del CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Smontaggio CD-ROM in corso\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "In attesa del disco...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Montaggio CD-ROM in corso \n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Scansione del disco alla ricerca di file indice, in corso..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation 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:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2731,38 +2769,38 @@ msgstr "" "Questo disco chiamato: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Copia della lista dei pacchetti in corso..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 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:792 msgid "Source list entries for this disc are:\n" msgstr "Le voci lista sorgenti per questo Disco sono:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Smontaggio CD-ROM in corso..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Scritti %i record.\n" -#: 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 "Scritti %i record con %i file mancanti.\n" -#: 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 "Scritti %i record con %i file senza match\n" -#: 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 "Scritti %i record con %i file mancanti e %i file senza match\n" @@ -2808,21 +2846,32 @@ 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/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Impossibile aprire il file %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connessione chiusa prematuramente" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +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" + #~ msgid "File date has changed %s" -#~ msgstr "La data del file cambiata %s" +#~ msgstr "La data del file è cambiata %s" #~ msgid "Reading file list" #~ msgstr "Lettura della lista dei file in corso" @@ -8,153 +8,163 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" -"PO-Revision-Date: 2006-01-25 20:55+0900\n" +"POT-Creation-Date: 2006-08-15 15:55+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" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8 bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, 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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "パッケージ %s が見つかりません" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "パッケージ名総数: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " 通常パッケージ: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " 純粋仮想パッケージ: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " 単一仮想パッケージ: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " 複合仮想パッケージ: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " 欠落: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "個別バージョン総数: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "個別バージョン総数: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "依存関係総数: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "バージョン/ファイル関係総数: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "バージョン/ファイル関係総数: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "提供マッピング総数: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Glob 文字列の総数: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "総依存関係・バージョン容量: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "総空き容量: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "総占有容量: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Package ファイル %s が同期していません。" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "パターンはちょうど 1 つだけ指定してください" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "パッケージが見つかりません" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "パッケージファイル:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "キャッシュが同期しておらず、パッケージファイルを相互参照できません" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Pin パッケージ:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(見つかりません)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " インストールされているバージョン: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(なし)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " 候補: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " パッケージ Pin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " バージョンテーブル:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s コンパイル日時: %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -302,7 +312,7 @@ msgstr "" " -c=? 指定した設定ファイルを読み込む\n" " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "%s に書き込めません" @@ -441,6 +451,8 @@ 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 @@ -537,14 +549,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " %1$s メンテナは %3$s ではなく %2$s です\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s に override エントリがありません\n" +msgstr " %s にソース override エントリがありません\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s に override エントリがありません\n" +msgstr " %s にバイナリ override エントリがありません\n" #: ftparchive/contents.cc:317 #, c-format @@ -746,121 +758,121 @@ msgstr "削除: %lu 個、保留: %lu 個。\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "依存関係を解決しています ..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " 失敗しました。" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "依存関係を訂正できません" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "アップグレードセットを最小化できません" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " 完了" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ" "ん。" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "未解決の依存関係があります。-f オプションを試してください。" -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "警告: 以下のパッケージは認証されていません!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "認証の警告は上書きされました。\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "検証なしにこれらのパッケージをインストールしますか [y/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "いくつかのパッケージを認証できませんでした" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。" -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "内部エラー、調整が終わっていません" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "ダウンロードディレクトリをロックできません" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "ソースのリストを読むことができません。" -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "おっと、サイズがマッチしません。apt@packages.debian.org にメールしてください" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%2$sB 中 %1$sB のアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB のアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "展開後に追加で %sB のディスク容量が消費されます。\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "展開後に %sB のディスク容量が解放されます。\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s の空き領域を測定できません" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "%s に充分な空きスペースがありません。" -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。" -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -871,28 +883,28 @@ msgstr "" "続行するには、'%s' というフレーズをタイプしてください。\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "中断しました。" -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "続行しますか [Y/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "いくつかのファイルの取得に失敗しました" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -900,49 +912,49 @@ msgstr "" "いくつかのアーカイブが取得できません。apt-get update を実行するか --fix-" "missing オプションを付けて試してみてください。" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "足りないパッケージを直すことができません。" -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "インストールを中断します。" -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "注意、%2$s の代わりに %1$s を選択します\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "すでにインストールされておりアップグレードも設定されていないため、%s をスキッ" "プします。\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "パッケージ %s はインストールされていないため、削除はできません\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s は以下のパッケージで提供されている仮想パッケージです:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [インストール済み]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "インストールするパッケージを明示的に選択する必要があります。" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -953,49 +965,49 @@ msgstr "" "おそらく、そのパッケージが見つからないか、もう古くなっているか、\n" "あるいは別のソースからのみしか利用できないという状況が考えられます\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "しかし、以下のパッケージで置き換えられています:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "パッケージ %s にはインストール候補がありません" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "ダウンロードできないため、%s の再インストールは不可能です。\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s はすでに最新バージョンです。\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%3$s にはバージョン %1$s (%2$s) を選択しました\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "update コマンドは引数をとりません" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "list ディレクトリをロックできません" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1003,26 +1015,26 @@ msgstr "" "いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され" "るか、古いものが代わりに使われます。" -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "以下の情報がこの問題を解決するために役立つかもしれません:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "内部エラー、問題リゾルバが何かを破壊しました" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部エラー、AllUpgrade が何かを破壊しました" @@ -1566,9 +1578,9 @@ 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:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "パッケージリストを読み込んでいます" @@ -1704,11 +1716,13 @@ msgid "File not found" msgstr "ファイルが見つかりません" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: 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/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "変更時刻の設定に失敗しました" @@ -1836,7 +1850,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "ファイルのハッシュでの問題" @@ -1921,9 +1935,9 @@ msgid "Unable to connect to %s %s:" msgstr "%s %s へ接続できません:" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "'%s' を解決できませんでした" +msgstr "キーリングにアクセスできませんでした: '%s'" #: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." @@ -1939,9 +1953,11 @@ msgid "At least one invalid signature was encountered." msgstr "少なくとも 1 つの不正な署名が発見されました。" #: methods/gpgv.cc:213 -#, fuzzy, c-format +#, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr " 署名の検証 (gnupg はインストールされていますか?)" +msgstr "" +"署名を検証するための '%s' の実行ができませんでした (gnupg はインストールされ" +"ていますか?)" #: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" @@ -1957,86 +1973,86 @@ msgid "" "available:\n" msgstr "公開鍵を利用できないため、以下の署名は検証できませんでした:\n" -#: methods/gzip.cc:57 +#: 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:102 methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "%s プロセスからの読み込みエラー" -#: methods/http.cc:376 +#: methods/http.cc:375 msgid "Waiting for headers" msgstr "ヘッダの待機中です" -#: methods/http.cc:522 +#: methods/http.cc:521 #, c-format msgid "Got a single header line over %u chars" msgstr "%u 文字を超える 1 行のヘッダを取得しました" -#: methods/http.cc:530 +#: methods/http.cc:529 msgid "Bad header line" msgstr "不正なヘッダ行です" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "http サーバが不正なリプライヘッダを送信してきました" -#: methods/http.cc:585 +#: methods/http.cc:584 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http サーバが不正な Content-Length ヘッダを送信してきました" -#: methods/http.cc:600 +#: methods/http.cc:599 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http サーバが不正な Content-Range ヘッダを送信してきました" -#: methods/http.cc:602 +#: methods/http.cc:601 msgid "This HTTP server has broken range support" msgstr "http サーバのレンジサポートが壊れています" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "不明な日付フォーマットです" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "select に失敗しました" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "接続タイムアウト" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "出力ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:874 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました" -#: methods/http.cc:876 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "サーバからの読み込みに失敗しました" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "不正なヘッダです" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "接続失敗" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "内部エラー" @@ -2049,7 +2065,7 @@ msgstr "空のファイルを mmap できません" msgid "Couldn't make mmap of %lu bytes" msgstr "%lu バイトの mmap ができませんでした" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "選択された %s が見つかりません" @@ -2109,12 +2125,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... 完了" @@ -2246,108 +2262,110 @@ msgstr "ファイルの削除中に問題が発生しました" msgid "Problem syncing the file" msgstr "ファイルの同期中に問題が発生しました" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "空のパッケージキャッシュ" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "パッケージキャッシュファイルが壊れています" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "このパッケージキャッシュファイルは互換性がないバージョンです" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "この APT はバージョニングシステム '%s' をサポートしていません" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "パッケージキャッシュが異なるアーキテクチャ用に構築されています" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "依存" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "先行依存" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "提案" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "推奨" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "競合" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "置換" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "廃止" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "重要" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "要求" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "標準" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "任意" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "特別" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "依存関係ツリーを作成しています" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "候補バージョン" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "依存関係の生成" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "入手可能情報をマージしています" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "%s のオープンに失敗しました" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "ファイル %s の書き込みに失敗しました" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "パッケージファイル %s を解釈することができません (2)" @@ -2382,7 +2400,7 @@ msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)" msgid "Opening %s" msgstr "%s をオープンしています" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。" @@ -2451,14 +2469,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 @@ -2470,19 +2488,19 @@ msgstr "メソッドドライバ %s が見つかりません。" msgid "Method %s did not start correctly" msgstr "メソッド %s が正常に開始しませんでした" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "'%s' とラベルの付いたディスクをドライブ '%s' に入れて enter を押してくださ" "い。" -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "パッケージングシステム '%s' はサポートされていません" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "適切なパッケージシステムタイプを特定できません" @@ -2531,90 +2549,107 @@ msgstr "キャッシュに非互換なバージョニングシステムがあり msgid "Error occurred while processing %s (NewPackage)" msgstr "%s を処理中にエラーが発生しました (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "%s を処理中にエラーが発生しました (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "%s を処理中にエラーが発生しました (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "%s を処理中にエラーが発生しました (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "%s を処理中にエラーが発生しました (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "%s を処理中にエラーが発生しました (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "%s を処理中にエラーが発生しました (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "%s を処理中にエラーが発生しました (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "%s を処理中にエラーが発生しました (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "この APT が対応している以上の数のパッケージが指定されました。" -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "この APT が対応している以上の数のバージョンが要求されました。" -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "この APT が対応している以上の数のバージョンが要求されました。" + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "この APT が対応している以上の数の依存関係が発生しました。" -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "%s を処理中にエラーが発生しました (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "%s を処理中にエラーが発生しました (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "ソースパッケージリスト %s の状態を取得できません" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "ファイル提供情報を収集しています" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "ソースキャッシュの保存中に IO エラーが発生しました" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "名前の変更に失敗しました。%s (%s -> %s)" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "MD5Sum が適合しません" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2623,7 +2658,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2632,7 +2667,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります。" -#: apt-pkg/acquire-item.cc:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2640,7 +2675,7 @@ msgstr "" "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: " "フィールドがありません。" -#: apt-pkg/acquire-item.cc:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "サイズが適合しません" @@ -2649,7 +2684,7 @@ msgstr "サイズが適合しません" msgid "Vendor block %s contains no fingerprint" msgstr "ベンダブロック %s はフィンガープリントを含んでいません" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2658,49 +2693,51 @@ msgstr "" "CD-ROM マウントポイント %s を使用します\n" "CD-ROM をマウントしています\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "確認しています.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "格納されたラベル: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM マウントポイント %s を使用します\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM をアンマウントしています\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "ディスクを待っています ...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM をマウントしています ...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "ディスクのインデックスファイルを走査しています ..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" "%i のパッケージインデックス、%i のソースインデックス、%i の署名を見つけまし" "た\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "これは有効な名前ではありません。再試行してください。\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2709,38 +2746,38 @@ msgstr "" "このディスクは以下のように呼ばれます: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "パッケージリストをコピーしています ..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "新しいソースリストを書き込んでいます\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "このディスクのソースリストのエントリ:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "CD-ROM をアンマウントしています ..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "%i レコードを書き込みました。\n" -#: 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 "%i レコードを書き込みました。%i 個のファイルが存在しません。\n" -#: 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 "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n" -#: 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 "" @@ -2788,19 +2825,28 @@ 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/rred.cc:219 +msgid "Could not patch file" +msgstr "ファイルにパッチできませんでした" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "途中で接続がクローズされました" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +msgid "There is no public key available for the following key IDs:\n" +msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" + #~ msgid "File date has changed %s" #~ msgstr "ファイル %s の日付が変更されています" @@ -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,153 +5,163 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" -"PO-Revision-Date: 2006-07-20 00:28+0900\n" +"POT-Creation-Date: 2006-08-15 15:55+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "%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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "%s 꾸러미를 찾을 수 없습니다" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "전체 꾸러미 이름 : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " 일반 꾸러미: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " 순수 가상 꾸러미: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " 단일 가상 꾸러미: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " 혼합 가상 꾸러미: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " 빠짐: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "전체 구역별 버전: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "전체 구역별 버전: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "전체 의존성: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "전체 버전/파일 관계: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "전체 버전/파일 관계: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "전체 제공 매핑: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "전체 패턴 문자열: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "전체 의존성 버전 용량: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "전체 빈 용량: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "차지하는 전체 용량: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "꾸러미 파일 %s 파일이 동기화되지 않았습니다." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "정확히 한 개의 패턴을 넘겨야 합니다" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "꾸러미가 없습니다" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "꾸러미 파일:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "캐시가 동기화되지 않았습니다. 꾸러미 파일을 상호 참조할 수 없습니다" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "핀 꾸러미:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(없음)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " 설치: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(없음)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " 후보: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " 꾸러미 핀: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " 버전 테이블:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s (%s %s), 컴파일 시각 %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -298,7 +308,7 @@ msgstr "" " -c=? 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다, 예를 들어 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "%s에 쓸 수 없습니다" @@ -436,6 +446,8 @@ 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 @@ -534,14 +546,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " %s 관리자가 %s입니다 (%s 아님)\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s에는 override 항목이 없습니다\n" +msgstr " %s에는 source override 항목이 없습니다\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s에는 override 항목이 없습니다\n" +msgstr " %s에는 binary override 항목이 없습니다\n" #: ftparchive/contents.cc:317 #, c-format @@ -743,124 +755,124 @@ msgstr "%lu개 지우기 및 %lu개 업그레이드 안 함.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "의존성을 바로잡는 중입니다..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " 실패." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "의존성을 바로잡을 수 없습니다" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "업그레이드 집합을 최소화할 수 없습니다" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " 완료" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "이 상황을 바로잡으려면 `apt-get -f install'을 실행해야 할 수도 있습니다." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "경고: 다음 꾸러미를 인증할 수 없습니다!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "인증 경고를 무시합니다.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "확인하지 않고 꾸러미를 설치하시겠습니까 [y/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "인증할 수 없는 꾸러미가 있습니다" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "내부 오류. 망가진 꾸러미에서 InstallPackages를 호출했습니다!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "꾸러미를 지워야 하지만 지우기가 금지되어 있습니다." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "내려받기 디렉토리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "소스 목록을 읽을 수 없습니다." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "이상하게도 크기가 서로 다릅니다. apt@packages.debian.org로 이메일을 보내주십" "시오." -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%s바이트/%s바이트 아카이브를 받아야 합니다.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%s바이트 아카이브를 받아야 합니다.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "압축을 풀면 %s바이트의 디스크 공간을 더 사용하게 됩니다.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "압축을 풀면 %s바이트의 디스크 공간이 비워집니다.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "%s 안에 충분한 여유 공간이 없습니다." -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 " "아닙니다." # 입력을 받아야 한다. 한글 입력을 못 할 수 있으므로 원문 그대로 사용. -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -871,28 +883,28 @@ msgstr "" "계속하시려면 다음 문구를 입력하십시오: '%s'\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "중단." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는 데 실패했습니다 %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "일부 파일을 받는 데 실패했습니다" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "내려받기를 마쳤고 내려받기 전용 모드입니다" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -900,48 +912,48 @@ msgstr "" "아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-" "missing 옵션을 줘서 실행해야 할 것입니다." -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "빠진 꾸러미를 바로잡을 수 없습니다." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "설치를 중단합니다." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "주의, %2$s 대신에 %1$s 꾸러미를 선택합니다\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s 꾸러미를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "%s 꾸러미를 설치하지 않았으므로, 지우지 않습니다\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s 꾸러미는 다음 꾸러미가 제공하는 가상 꾸러미입니다:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [설치함]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "설치하려면 분명하게 하나를 선택해야 합니다." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -952,49 +964,49 @@ msgstr "" "해당 꾸러미가 누락되었거나 지워졌다는 뜻입니다. 아니면 또 다른 곳에서\n" "꾸러미를 받아와야 하는 경우일 수도 있습니다.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "하지만 다음 꾸러미가 대체합니다:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "%s 꾸러미는 설치할 수 있는 후보가 없습니다" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s 꾸러미를 다시 설치하는 건 불가능합니다. 내려 받을 수 없습니다.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 꾸러미는 이미 최신 버전입니다.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "%2$s 꾸러미의 '%1$s' 릴리즈를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "%2$s 꾸러미의 '%1$s' 버전을 찾을 수 없습니다" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%3$s 꾸러미의 %1$s (%2$s) 버전을 선택합니다\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "update 명령은 인수를 받지 않습니다" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "목록 디렉토리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1002,26 +1014,26 @@ msgstr "" "일부 인덱스 파일을 내려받는 데 실패했습니다. 해당 파일을 무시하거나 과거의 버" "전을 대신 사용합니다." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "내부 오류, 문제 해결 프로그램이 사고쳤습니다" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "내부 오류, AllUpgrade때문에 망가졌습니다" @@ -1556,9 +1568,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:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "꾸러미 목록을 읽는 중입니다" @@ -1684,18 +1696,20 @@ msgstr "%s 안의 CD-ROM을 마운트 해제할 수 없습니다. 사용 중일 #: methods/cdrom.cc:169 msgid "Disk not found." -msgstr "디스크가 없습니다" +msgstr "디스크가 없습니다." #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "파일이 없습니다" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: 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/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "파일 변경 시각을 설정하는 데 실패했습니다" @@ -1823,7 +1837,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "파일 해싱에 문제가 있습니다" @@ -1928,7 +1942,7 @@ msgstr "최소한 하나 이상의 서명이 잘못되었습니다." #: 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" @@ -1944,86 +1958,86 @@ msgid "" "available:\n" msgstr "다음 서명들은 공개키가 없기 때문에 인증할 수 없습니다:\n" -#: methods/gzip.cc:57 +#: 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:102 methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다" -#: methods/http.cc:376 +#: methods/http.cc:375 msgid "Waiting for headers" msgstr "헤더를 기다리는 중입니다" -#: methods/http.cc:522 +#: methods/http.cc:521 #, c-format msgid "Got a single header line over %u chars" msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다" -#: methods/http.cc:530 +#: methods/http.cc:529 msgid "Bad header line" msgstr "헤더 줄이 잘못되었습니다" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다" -#: methods/http.cc:585 +#: methods/http.cc:584 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다" -#: methods/http.cc:600 +#: methods/http.cc:599 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다" -#: methods/http.cc:602 +#: methods/http.cc:601 msgid "This HTTP server has broken range support" msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "데이터 형식을 알 수 없습니다" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "select가 실패했습니다" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "연결 시간이 초과했습니다" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "출력 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "해당 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:874 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다" -#: methods/http.cc:876 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "서버에서 읽는 데 오류가 발생했습니다" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "헤더 데이터가 잘못되었습니다" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "연결이 실패했습니다" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "내부 오류" @@ -2036,7 +2050,7 @@ msgstr "빈 파일에 mmap할 수 없습니다" msgid "Couldn't make mmap of %lu bytes" msgstr "%lu바이트를 mmap할 수 없습니다" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "선택한 %s이(가) 없습니다" @@ -2096,12 +2110,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... 완료" @@ -2233,108 +2247,110 @@ msgstr "파일을 지우는 데 문제가 있습니다" msgid "Problem syncing the file" msgstr "파일을 동기화하는 데 문제가 있습니다" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "꾸러미 캐시가 비어 있습니다" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "꾸러미 캐시 파일이 손상되었습니다" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "꾸러미 캐시 파일이 호환되지 않는 버전입니다" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "이 APT는 Version System '%s'을(를) 지원하지 않습니다" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "꾸러미 캐시가 다른 아키텍쳐용입니다." -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "의존" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "선의존" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "제안" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "추천" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "충돌" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "대체" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "없앰" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "중요" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "필수" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "표준" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "옵션" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "별도" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "의존성 트리를 만드는 중입니다" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "후보 버전" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "의존성 만들기" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "이용 가능 꾸러미 정보를 합칩니다" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "%s 파일을 여는 데 실패했습니다" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "%s 파일을 쓰는 데 실패했습니다" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "꾸러미 파일 %s 파일을 파싱할 수 없습니다 (2)" @@ -2369,7 +2385,7 @@ msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파 msgid "Opening %s" msgstr "%s 파일을 여는 중입니다" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다." @@ -2456,18 +2472,18 @@ msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다." msgid "Method %s did not start correctly" msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, 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:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "꾸러미 시스템 '%s'을(를) 지원하지 않습니다" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "올바른 꾸러미 시스템 타입을 알아낼 수 없습니다" @@ -2510,90 +2526,107 @@ msgstr "캐시의 버전 시스템이 호환되지 않습니다" msgid "Error occurred while processing %s (NewPackage)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "와우, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다." +msgstr "우와, 이 APT가 처리할 수 있는 꾸러미 이름 개수를 넘어갔습니다." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "와우, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다." +msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "와우, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다." +msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "%s 처리중에 오류가 발생했습니다 (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "%s 처리중에 오류가 발생했습니다 (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "파일 의존성을 처리하는 데, %s %s 꾸러미가 없습니다" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "소스 꾸러미 목록 %s의 정보를 읽을 수 없습니다" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "파일에서 제공하는 것을 모으는 중입니다" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "MD5Sum이 맞지 않습니다" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" msgstr "다음 키 ID의 공개키가 없습니다:\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2602,7 +2635,7 @@ msgstr "" "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2611,14 +2644,14 @@ msgstr "" "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다." -#: apt-pkg/acquire-item.cc:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다." -#: apt-pkg/acquire-item.cc:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "크기가 맞지 않습니다" @@ -2627,7 +2660,7 @@ msgstr "크기가 맞지 않습니다" msgid "Vendor block %s contains no fingerprint" msgstr "벤더 블럭 %s의 핑거프린트가 없습니다" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2636,47 +2669,49 @@ msgstr "" "CD-ROM 마운트 위치로 %s 사용\n" "CD-ROM을 마운트하는 중입니다\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "알아보는 중입니다.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "저장된 레이블: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM 마운트 위치 %s 사용\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM 마운트 해제하는 중입니다\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "디스크를 기다리는 중입니다...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM 마운트하는 중입니다...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "디스크에서 색인 파일을 찾는 중입니다...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "꾸러미 색인 %i개, 소스 색인 %i개, 시그너처 %i개 발견\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "올바른 이름이 아닙니다. 다시 시도하십시오.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2685,38 +2720,38 @@ msgstr "" "이 디스크는 다음과 같습니다: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "꾸러미 목록을 복사하는 중입니다..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "새 소스 리스트를 쓰는 중입니다\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "CD-ROM을 마운트 해제하는 중입니다..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "레코드 %i개를 썼습니다.\n" -#: 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 "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n" -#: 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 "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n" -#: 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 "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n" @@ -2771,10 +2806,20 @@ msgstr "%s을(를) 완전히 지울 준비를 하는 중입니다" msgid "Completely removed %s" msgstr "%s을(를) 완전히 지웠습니다" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "%s 파일을 열 수 없습니다" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "연결이 너무 빨리 끊어졌습니다" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +msgid "There is no public key available for the following key IDs:\n" +msgstr "다음 키 ID의 공개키가 없습니다:\n" + #~ msgid "File date has changed %s" #~ msgstr "%s 파일의 마지막 수정 시각이 바뀌엇습니다" @@ -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,161 +9,171 @@ # 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-08-09 23:46+0200\n" -"PO-Revision-Date: 2005-02-09 10:45+0100\n" +"POT-Creation-Date: 2006-08-15 15:55+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" "X-Generator: KBabel 1.9.1\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakken %s versjon %s har et uinnfridd avhengighetsforhold:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Klarer ikke finne pakken %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Plassmengde pakkenavn: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Vanlige pakker: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Rent virtuelle pakker: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Enkle virtuelle pakker: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Sammensatte virtuelle pakker: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Mangler: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Antall unike versjoner: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Antall unike versjoner: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Antall avhengighetsforhold: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Antall forhold versjon/fil: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Antall forhold versjon/fil: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Antall tilbudte tilknyttinger: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Antall utvidede strenger: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Total plass for avhengighetsforhold/versjoner: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Plass brukt av slark: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Samlet mengde redegjort plass: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Pakkefila %s er ikke oppdatert." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Du m oppgi nyaktig ett mnster" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Fant ingen pakker" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Pakkefiler:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Mellomlageret er ikke oppdatert, kan ikke kryssreferere til en pakkefil" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Lste pakker:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(ikke funnet)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Installert: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(ingen)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Pakke lst til: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Versjonstabell:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert p %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -244,19 +250,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" @@ -320,7 +322,7 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Sett en vilkrlig innstilling, f.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Kan ikke skrive til %s" @@ -354,7 +356,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" @@ -460,6 +461,8 @@ 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 @@ -556,14 +559,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikeholderen er %s, ikke %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s har ingen overstyringsoppfring\n" +msgstr " %s har ingen kildeoverstyringsoppfring\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s har ingen overstyringsoppfring\n" +msgstr " %s har ingen binroverstyringsoppfring heller\n" #: ftparchive/contents.cc:317 #, c-format @@ -733,12 +736,11 @@ msgid "%s (due to %s) " msgstr "%s (pga. %s) " #: cmdline/apt-get.cc:547 -#, 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:578 @@ -766,152 +768,153 @@ msgstr "%lu fjerne og %lu ikke oppgradert.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu pakker ikke fullt installert eller fjernet.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Retter p avhengighetsforhold ..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " mislyktes." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Klarer ikke rette p avhengighetsforholdene" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Klarer ikke minimere oppgraderingsettet" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Utfrt" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Du vil kanskje kjre apt-get -f install for rette p dette." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Uinnfridde avhengighetsforhold - Prv -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Flgende pakker ble ikke autentisert!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Autentiseringsadvarsel overstyrt.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Installer disse pakkene uten verifikasjon [j/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Noen pakker ble ikke autentisert" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppsto problemer og -y ble brukt uten --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "Intern feil, InstallPackages ble kalt med delagte pakker!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Pakker trenges fjernes, men funksjonen er sltt av." -#: cmdline/apt-get.cc:776 -#, fuzzy +#: cmdline/apt-get.cc:790 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:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Klarer ikke lse nedlastingsmappa" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Kan ikke lese kildlista." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 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:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "M hente %sB/%sB med arkiver.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "M hente %sB med arkiver.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Etter utpakking vil %sB ekstra diskplass bli brukt.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB diskplass bli ledig.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 -#, fuzzy, c-format +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 +#, 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:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Dessverre, ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Bare trivielle endringer ble angitt, men dette er ikke en triviell endring." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Ja, gjr som jeg sier!" -#: cmdline/apt-get.cc:869 -#, fuzzy, c-format +#: cmdline/apt-get.cc:883 +#, 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:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Avbryter." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke skaffe %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Noen av filene kunne ikke lastes ned" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Nedlasting fullfrt med innstillinga bare nedlasting" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -919,48 +922,48 @@ msgstr "" "Klarte ikke hente alle arkivene. Du kan prve med apt-get update eller " "--fix-missing." -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og bytte av media stttes n ikke" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Klarer ikke rette p manglende pakker." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Avbryter istallasjonen." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Merk, velger %s istedenfor %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Omgr %s - den er allerede installert eller ikke satt til oppgradering.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Installert]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Du m velge en pakke som skal installeres." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -971,49 +974,49 @@ msgstr "" "Dette kan bety at pakken mangler, er utgtt, eller bare finnes \n" "tilgjengelig fra en annen kilde.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Flgende pakker erstatter den imidlertid:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakken %s har ingen installasjonskandidat" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Det er ikke mulig installere %s p nytt - den kan ikke nedlastes.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s er allerede nyeste versjon.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgave %s av %s ble ikke funnet" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versjon %s av %s ble ikke funnet" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Utvalgt versjon %s (%s) for %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Kan ikke lse listemappa" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1021,26 +1024,26 @@ msgstr "" "Klarte ikke laste ned alle oversiktfilene. De ble ignorerte, eller gamle " "ble brukt isteden. " -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "Flgende informasjon kan vre til hjelp med lse problemet:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" -msgstr "Intern feil - AllUpgrade dela noe" +msgstr "Intern feil, problemlser dela noe" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil - AllUpgrade dela noe" @@ -1117,9 +1120,8 @@ msgid "Done" msgstr "Utfrt" #: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869 -#, fuzzy msgid "Internal error, problem resolver broke stuff" -msgstr "Intern feil - AllUpgrade dela noe" +msgstr "Intern feil, problemlser dela noe" #: cmdline/apt-get.cc:1969 msgid "Must specify at least one package to fetch source for" @@ -1131,9 +1133,9 @@ msgid "Unable to find a source package for %s" msgstr "Klarer ikke finne en kildekodepakke for %s" #: cmdline/apt-get.cc:2043 -#, fuzzy, c-format +#, 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:2067 #, c-format @@ -1172,7 +1174,7 @@ msgstr "Utpakkingskommandoen %s mislyktes.\n" #: cmdline/apt-get.cc:2153 #, 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:2170 #, c-format @@ -1489,7 +1491,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" @@ -1578,9 +1580,9 @@ msgstr "" "Infokatalogen og den midlertidige katalogen m vre p det samme filsystemet" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Leser pakkelister" @@ -1709,20 +1711,21 @@ msgstr "" "bruk." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "Fant ikke fila" +msgstr "Disk ikke funnet." #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Fant ikke fila" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: methods/gzip.cc:141 methods/gzip.cc:150 msgid "Failed to stat" msgstr "Klarte ikke f status" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Klarte ikke sette endringstidspunkt" @@ -1850,7 +1853,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1935,123 +1938,125 @@ msgid "Unable to connect to %s %s:" msgstr "Klarte ikke koble til %s %s:" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, 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: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: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:209 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "Minst en ugyldig signatur ble funnet." #: 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:218 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Ukjent feil ved kjring av gpgv" #: methods/gpgv.cc:249 -#, fuzzy msgid "The following signatures were invalid:\n" -msgstr "Flgende ekstra pakker vil bli installert." +msgstr "De flgende signaturene var ugyldige:\n" #: 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: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: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:375 msgid "Waiting for headers" msgstr "Venter p hoder" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "delagt hodelinje" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-tjeneren sendte et ugyldig svarhode" -#: methods/http.cc:585 +#: methods/http.cc:584 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:599 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:601 msgid "This HTTP server has broken range support" msgstr "Denne HTTP-tjeneren har delagt sttte for omrde" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Tidsavbrudd p forbindelsen" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "delagte hodedata" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Intern feil" @@ -2064,7 +2069,7 @@ msgstr "Kan ikke utfre mmap p en tom fil" msgid "Couldn't make mmap of %lu bytes" msgstr "Kunne ikke lage mmap av %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Fant ikke utvalget %s" @@ -2124,12 +2129,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s ... Ferdig" @@ -2261,108 +2266,110 @@ msgstr "Problem ved oppheving av lenke til fila" msgid "Problem syncing the file" msgstr "Problem ved oppdatering av fila" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Tomt pakkelager" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Pakkens lagerfil er delagt" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Pakkens lagerfil er av feil versjon (samvirker ikke)" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Denne APT sttter ikke versjonssystemet %s" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Pakkelageret ble bygd for en annen arkitektur" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Avhenger av" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Forutsetter" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Foreslr" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Anbefaler" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Er i konflikt med" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Erstatter" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Nuller" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "viktig" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "pkrevet" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "vanlig" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "valgfri" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "tillegg" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Skaper oversikt over avhengighetsforhold" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Versjons-kandidater" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Oppretter avhengighetsforhold" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Fletter tilgjengelig informasjon" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Klarte ikke pne %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Klarte ikke skrive fila %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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 "Klarer ikke fortolke pakkefila %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Klarer ikke fortolke pakkefila %s (2)" @@ -2397,7 +2404,7 @@ msgstr "Feil p %lu i kildelista %s (dist fortolking)" msgid "Opening %s" msgstr "pner %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Linje %u i kildelista %s er for lang" @@ -2408,7 +2415,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" @@ -2467,12 +2474,12 @@ msgstr "Arkivmappa %spartial mangler." #: apt-pkg/acquire.cc:823 #, 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 +#, 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 @@ -2484,20 +2491,17 @@ msgstr "Finner ikke metode-driveren %s." msgid "Method %s did not start correctly" msgstr "Metoden %s startet ikke korrekt" -#: apt-pkg/acquire-worker.cc:384 -#, fuzzy, c-format +#: apt-pkg/acquire-worker.cc:377 +#, 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:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet %s stttes ikke" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Klarer ikke bestemme en passende pakkesystemtype" @@ -2542,90 +2546,108 @@ msgstr "Lageret har et uoverensstemmende versjonssystem" msgid "Error occurred while processing %s (NewPackage)" msgstr "Feil oppsto under behandling av %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Feil oppsto under behandling av %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Feil oppsto under behandling av %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Feil oppsto under behandling av %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Feil oppsto under behandling av %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Feil oppsto under behandling av %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Feil oppsto under behandling av %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Feil oppsto under behandling av %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Feil oppsto under behandling av %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Jss, du har overgtt antallet pakkenavn denne APT klarer." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jss, du har overgtt antallet versjoner denne APT klarer." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Jss, du har overgtt antallet versjoner denne APT klarer." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jss, du har overgtt antallet avhengighetsforhold denne APT klarer." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Feil oppsto under behandling av %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Feil oppsto under behandling av %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Fant ikke pakken %s %s ved behandling av filkrav" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Samler inn filtilbud" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "IO-feil ved lagring av kildekode-lager" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format 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:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "Feil MD5sum" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are 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:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2634,7 +2656,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:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2643,13 +2665,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:854 +#: apt-pkg/acquire-item.cc:1305 #, 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:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Feil strrelse" @@ -2658,7 +2680,7 @@ msgstr "Feil strrelse" msgid "Vendor block %s contains no fingerprint" msgstr "Utgivers blokk %s inneholder ikke no fingeravtrykk" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2667,47 +2689,49 @@ msgstr "" "Bruker CD-ROM monteringspunkt %s\n" "Monterer CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Indentifiserer.." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Lagret merkelapp: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Bruker CD-ROM monteringspunkt %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Avmonterer CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Venter p CD-en...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Monterer CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Leter gjennom CD for indeksfiler..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Fant %i pakkeindekser, %i kildeindekser og %i signaturer\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2716,96 +2740,107 @@ msgstr "" "CD-en er kalt: \n" "%s\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopierer pakkelister..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Skriver ny kildeliste\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Kildelisteoppfringer for denne CD-en er:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Avmonterer CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: 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 "Skrev %i poster med %i manglende filer.\n" -#: 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 "Skrev %i poster med %i feile filer.\n" -#: 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 "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/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Kunne ikke pne fila %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Forbindelsen ble uventet stengt" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +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" + #~ msgid "File date has changed %s" #~ msgstr "Fildatoen er endret %s" @@ -2543,7 +2543,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 @@ -1,159 +1,169 @@ -# 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-08-09 23:46+0200\n" -"PO-Revision-Date: 2005-02-10 17:35+0100\n" +"POT-Creation-Date: 2006-08-15 15:55+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" "Content-Type: text/plain; charset=iso-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakket %s versie %s heeft een niet-voldane vereiste:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Kan pakket %s niet vinden" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Totaal aantal pakketnamen: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Normale pakketten: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " -msgstr " Puur virtuele pakketten: " +msgstr " Zuiver virtuele pakketten: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Losstaande virtuele pakketten: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Gemengde virtuele pakketten: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " -msgstr " Missend: " +msgstr " Ontbrekend: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Totaal aantal verschillende versies: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Totaal aantal verschillende versies: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Totaal aantal vereisten: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Totaal aantal versie/bestand-relaties: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Totaal aantal versie/bestand-relaties: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Totaal aantal 'Voorziet'-toewijzingen " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Totaal aantal geglobde strings: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Totale hoeveelheid vereisten-versieruimte: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Totale onbenutte ruimte: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Totale hoeveelheid verantwoorde ruimte: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Pakketbestand %s is niet meer gesynchroniseerd." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "U dient precies n patroon op te geven" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Geen pakketten gevonden" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Pakketbestanden:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache loopt niet synchroon, kan pakketbestand niet 'x-ref'-en" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Vastgepinde pakketten:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(niet gevonden)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Genstalleerd: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(geen)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Kandidaat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Pakketpin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Versietabel:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s voor %s %s gecompileerd op %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -207,7 +217,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 +228,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 +241,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 +272,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" @@ -306,7 +314,7 @@ msgstr "" " -c=? Lees dit configuratiebestand.\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Kan niet naar %s schrijven" @@ -340,7 +348,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,54 +388,53 @@ 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 @@ -443,13 +449,15 @@ msgstr "DB is beschadigd, bestand hernoemd naar %s.old" #: 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:81 #, c-format @@ -514,7 +522,7 @@ msgstr " OntlLink %s [%s]\n" #: 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:269 #, c-format @@ -546,19 +554,19 @@ msgid " %s maintainer is %s not %s\n" msgstr " %s beheerder is %s, niet %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s heeft geen voorrangsingang\n" +msgstr " %s heeft geen voorrangsingang voor bronpakketten\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s heeft geen voorrangsingang\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" @@ -582,7 +590,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 @@ -634,7 +642,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" @@ -720,21 +728,20 @@ msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:" #: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " -msgstr "%s (wegens %s) " +msgstr "%s (vanwege %s) " #: cmdline/apt-get.cc:547 -#, 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:578 #, 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:582 #, c-format @@ -749,159 +756,160 @@ msgstr "%lu gedegradeerd, " #: cmdline/apt-get.cc:586 #, 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:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakketten niet volledig genstalleerd of verwijderd.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." -msgstr "Vereisten worden verbeterd..." +msgstr "Vereisten worden gecorrigeerd..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " mislukt." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" -msgstr "Kan vereisten niet verbeteren" +msgstr "Kan vereisten niet corrigeren" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 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:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Klaar" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden:" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Authenticatiewaarschuwing is genegeerd.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Wilt u deze pakketten installeren zonder verificatie [j/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Sommige pakketten konden niet geauthenticeerd worden" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "Interne fout, InstallPackages is aangeroepen met defecte pakketten!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." -#: cmdline/apt-get.cc:776 -#, fuzzy +#: cmdline/apt-get.cc:790 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:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "De lijst van bronnen kon niet gelezen worden." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 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:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Er moeten %sB aan archieven opgehaald worden.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Na het uitpakken zal er %sB extra schijfruimte gebruikt worden.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Na het uitpakken zal er %sB schijfruimte vrijkomen.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 -#, fuzzy, c-format +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 +#, 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:850 +#: cmdline/apt-get.cc:864 #, 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:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Ja, doe wat ik zeg!" -#: cmdline/apt-get.cc:869 -#, fuzzy, c-format +#: cmdline/apt-get.cc:883 +#, 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:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Afbreken." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s %s is mislukt\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -909,49 +917,49 @@ msgstr "" "Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --" "fix-missing proberen?" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Geen oplossing voor de missende pakketten gevonden." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Installatie wordt afgebroken." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Let op, %s wordt geselecteerd in plaats van %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s wordt overgeslagen, het is al genstalleerd en opwaardering is niet " "gevraagd.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakket %s is niet genstalleerd, en wordt dus niet verwijderd\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakket %s is een virtueel pakket voorzien door:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Genstalleerd]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "U dient er n expliciet te selecteren voor installatie." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -962,50 +970,50 @@ msgstr "" "een ander pakket. Mogelijk betekent dit dat het pakket ontbreekt,\n" "verouderd is, of enkel beschikbaar is van een andere bron\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Echter, de volgende pakketten vervangen dit:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakket %s heeft geen installeerbare kandidaat" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Herinstallatie van %s is niet mogelijk daar het niet opgehaald kan worden.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s is reeds de nieuwste versie.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' voor '%s' is niet gevonden" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versie '%s' voor '%s' is niet gevonden" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versie %s (%s) geselecteerd voor %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "De 'update'-opdracht aanvaard geen argumenten" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Kon de lijst-map niet vergrendelen" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1013,26 +1021,26 @@ msgstr "" "Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er " "zijn oudere versies van gebruikt." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "De volgende informatie helpt u mogelijk verder:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" -msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" +msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" @@ -1110,15 +1118,14 @@ msgid "Done" msgstr "Klaar" #: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869 -#, fuzzy 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:1969 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:1999 cmdline/apt-get.cc:2228 #, c-format @@ -1126,9 +1133,9 @@ msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" #: cmdline/apt-get.cc:2043 -#, fuzzy, c-format +#, 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:2067 #, c-format @@ -1167,7 +1174,7 @@ msgstr "Uitpakopdracht '%s' is mislukt.\n" #: cmdline/apt-get.cc:2153 #, 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:2170 #, c-format @@ -1497,7 +1504,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" @@ -1586,9 +1593,9 @@ msgstr "" "De 'info'- en de 'temp'-mappen dienen op hetzelfde bestandsysteem te staan" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Pakketlijsten worden ingelezen" @@ -1717,20 +1724,21 @@ msgstr "" "Kan de CD-ROM in %s niet loskoppelen, mogelijk wordt die nog steeds gebruikt." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "Bestand niet gevonden" +msgstr "Schijf niet gevonden" #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Bestand niet gevonden" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: methods/gzip.cc:141 methods/gzip.cc:150 msgid "Failed to stat" msgstr "Status opvragen is mislukt" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Instellen van de aanpassingstijd is mislukt" @@ -1858,7 +1866,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" @@ -1943,126 +1951,133 @@ msgid "Unable to connect to %s %s:" msgstr "Kan niet verbinden met %s %s:" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Kon '%s' niet vinden" +msgstr "Kon de sleutelring niet benaderen: '%s'" #: 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: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:209 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "Er is tenminste n ongeldige ondertekening gevonden." #: 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:218 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Onbekende fout bij het uitvoeren van gpgv" #: methods/gpgv.cc:249 -#, fuzzy 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: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: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: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:375 msgid "Waiting for headers" msgstr "Wachtend op de kopteksten" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Foute koptekstregel" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 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:584 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:599 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:601 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:625 msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Interne fout" @@ -2075,7 +2090,7 @@ msgstr "Kan een leeg bestand niet mmappen" msgid "Couldn't make mmap of %lu bytes" msgstr "Kon van %lu bytes geen mmap maken" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Selectie %s niet gevonden" @@ -2137,12 +2152,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Klaar" @@ -2279,108 +2294,110 @@ msgstr "Probleem bij het ontlinken van het bestand" msgid "Problem syncing the file" msgstr "Probleem bij het synchroniseren van het bestand" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Lege pakketcache" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Het pakketcachebestand is beschadigd" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Het pakketcachebestand heeft een niet-compatible versie" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Deze APT ondersteunt het versienummeringssysteem '%s' niet" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "De pakketcache was aangemaakt voor een andere architectuur" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Vereisten" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Voor-Vereisten" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Suggesties" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Aanbevelingen" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Conflicteert met" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Vervangt" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Verouderd" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "belangrijk" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "noodzakelijk" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standaard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "optioneel" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Boom van vereisten wordt opgebouwd" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Kandidaat-versies" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Generatie vereisten" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "De beschikbare informatie wordt samengevoegd" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Openen van %s is mislukt" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Wegschrijven van bestand %s is mislukt" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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 "Kon pakketbestand %s niet ontleden (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kon pakketbestand %s niet ontleden (2)" @@ -2415,7 +2432,7 @@ msgstr "Misvormde regel %lu in bronlijst %s (dist parse)" msgid "Opening %s" msgstr "%s wordt geopend" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Regel %u van de bronlijst %s is te lang." @@ -2426,9 +2443,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 @@ -2470,7 +2487,7 @@ msgstr "" #: apt-pkg/algorithms.cc:1077 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 @@ -2487,12 +2504,12 @@ msgstr "Archiefmap %spartial is afwezig." #: apt-pkg/acquire.cc:823 #, 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 +#, 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 @@ -2504,20 +2521,19 @@ msgstr "Het methodestuurprogramma %s kon niet gevonden worden." msgid "Method %s did not start correctly" msgstr "Methode %s startte niet op de juiste manier" -#: apt-pkg/acquire-worker.cc:384 -#, fuzzy, c-format +#: apt-pkg/acquire-worker.cc:377 +#, 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:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Kan geen geschikt pakketsysteemtype bepalen" @@ -2564,92 +2580,110 @@ msgstr "Cache heeft een niet-compatibel versienummeringssysteem" msgid "Error occurred while processing %s (NewPackage)" msgstr "Fout tijdens verwerken van %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Fout tijdens verwerken van %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Fout tijdens verwerken van %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Fout tijdens verwerken van %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Fout tijdens verwerken van %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Fout tijdens verwerken van %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Fout tijdens verwerken van %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Fout tijdens verwerken van %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Fout tijdens verwerken van %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Wauw, u heeft meer pakketten dan deze APT aankan." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wauw, u heeft meer versies dan deze APT aankan." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Wauw, u heeft meer versies dan deze APT aankan." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aankan." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Fout tijdens verwerken van %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Fout tijdens verwerken van %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakket %s %s werd niet gevonden bij het verwerken van de " "bestandsafhankelijkheden" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kon de status van de bronpakketlijst %s niet opvragen" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Voorziene bestanden worden verzameld" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "hernoeming is mislukt, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "MD5Sum komt niet overeen" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are 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:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2658,7 +2692,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:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2667,7 +2701,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:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2675,7 +2709,7 @@ msgstr "" "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-item.cc:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Grootte komt niet overeen" @@ -2684,7 +2718,7 @@ msgstr "Grootte komt niet overeen" msgid "Vendor block %s contains no fingerprint" msgstr "Verkopersblok %s bevat geen vingerafdruk" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2693,47 +2727,49 @@ msgstr "" "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n" "CD wordt aangekoppeld\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Identificatie..." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Opgeslagen label: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "CD wordt losgekoppeld\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Er wordt gewacht op de schijf...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "CD wordt aangekoppeld...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Er wordt gescant voor indexbestanden...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation 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:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2742,38 +2778,38 @@ msgstr "" "De schijf heet:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Pakketlijsten worden gekopieerd..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Nieuwe bronlijst wordt weggeschreven\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Bronlijst-ingangen voor de schijf zijn:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "CD wordt afgekoppeld..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "%i records weggeschreven.\n" -#: 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 "%i records weggeschreven met %i missende bestanden.\n" -#: 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 "%i records weggeschreven met %i niet overeenkomende bestanden\n" -#: 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 "" @@ -2781,68 +2817,66 @@ 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/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Kon het bestand %s niet openen" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Verbinding werd voortijdig afgebroken" -#~ msgid "File date has changed %s" -#~ msgstr "Bestandsdatum is veranderd %s" - -#~ msgid "Reading file list" -#~ msgstr "Bestandslijst wordt ingelezen" - +#: apt-pkg/acquire-item.cc:1097 #, 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" +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" @@ -3,160 +3,170 @@ # 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-08-09 23:46+0200\n" +"POT-Creation-Date: 2006-08-15 15:55+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" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9.1\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakken %s versjon %s har eit krav som ikkje er oppfylt:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Finn ikkje pakken %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Tal p pakkenamn: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Vanlege pakkar: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Reine virtuelle pakkar: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Enkle virtuelle pakkar: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Samansette virtuelle pakkar: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Manglar: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Tal p einskildversjonar: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Tal p einskildversjonar: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Tal p krav: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Tal p ver./fil-forhold: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Tal p ver./fil-forhold: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Tal p tilbyr-forhold: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Tal p strengar med jokerteikn: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Storleik p kravs- og versjonsrom: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Slingringsmon: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Brukt plass i alt: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Pakkefila %s er ute av takt." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Du m oppgi nyaktig eitt mnster" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Fann ingen pakkar" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Pakkefiler:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Mellomlageret er ute av takt, kan ikkje x-referera ei pakkefil" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Spikra pakkar:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(ikkje funne)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Installert: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(ingen)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Pakke spikra til: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Versjonstabell:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert p %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -307,7 +317,7 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Klarte ikkje skriva til %s" @@ -750,121 +760,121 @@ msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Rettar p krav ..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " mislukkast." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Klarte ikkje retta p krav" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Klarte ikkje minimera oppgraderingsmengda" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Ferdig" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Du vil kanskje prva retta p desse ved kyra apt-get -f install." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Nokre krav er ikkje oppfylte. Prv med -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "TVARING: Klarer ikkje autentisere desse pakkane." -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Installer desse pakkane utan verifikasjon [j/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Nokre pakkar kunne ikkje bli autentisert" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppstod problem, og -y vart brukt utan --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Nokre pakkar m fjernast, men fjerning er sltt av." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Intern feil ved tilleggjing av avleiing" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Klarte ikkje lsa nedlastingskatalogen" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Kjeldelista kan ikkje lesast." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "M henta %sB/%sB med arkiv.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "M henta %sB med arkiv.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, 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:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Trivial Only var spesifisert, men dette er ikkje noka triviell handling." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Ja, gjer som eg seier!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -875,28 +885,28 @@ msgstr "" "For halda fram, m du skriva nyaktig %s.\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Avbryt." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Klarte ikkje henta nokre av filene" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -904,49 +914,49 @@ msgstr "" "Klarte ikkje henta nokre av arkiva. Du kan prva med apt-get update eller " "--fix-missing." -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og byte av medium er ikkje sttta for tida" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Klarte ikkje retta opp manglande pakkar." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Avbryt installasjon." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Merk, vel %s i staden for %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Hoppar over %s, for den er installert fr fr og ikkje sett til " "oppgradering.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er ein virtuell pakke, tilbydd av:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Installert]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Du m velja ein som skal installerast." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -957,49 +967,49 @@ msgstr "" "av ein annan pakke. Dette tyder at pakket manglar, er gjort overfldig\n" "eller er berre tilgjengeleg fr ei anna kjelde\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Dei flgjande pakkane kan brukast i staden:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Det finst ingen installasjonskandidat for pakken %s" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s kan ikkje installerast p nytt, for pakken kan ikkje lastast ned.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "Den nyaste versjonen av %s er installert fr fr.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Fann ikkje utgva %s av %s" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Fann ikkje versjonen %s av %s" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vald versjon %s (%s) for %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Oppdateringskommandoen tek ingen argument" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Klarte ikkje lsa listekatalogen" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1007,26 +1017,26 @@ msgstr "" "Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle " "filer er brukte i staden." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" @@ -1562,9 +1572,9 @@ msgstr "" "Infokatalogen og den mellombelse katalogen m vera p det same filsystemet" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Les pakkelister" @@ -1701,11 +1711,13 @@ msgid "File not found" msgstr "Fann ikkje fila" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: methods/gzip.cc:141 methods/gzip.cc:150 msgid "Failed to stat" msgstr "Klarte ikkje f status" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Klarte ikkje setja endringstidspunkt" @@ -1833,7 +1845,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1955,86 +1967,86 @@ msgid "" "available:\n" msgstr "" -#: methods/gzip.cc:57 +#: 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: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:375 msgid "Waiting for headers" msgstr "Ventar p hovud" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "ydelagd hovudlinje" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-tenaren sende eit ugyldig svarhovud" -#: methods/http.cc:585 +#: methods/http.cc:584 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:599 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:601 msgid "This HTTP server has broken range support" msgstr "Denne HTTP-tenaren har ydelagd sttte for omrde" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Tidsavbrot p sambandet" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Feil ved lesing fr tenaren" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "ydelagde hovuddata" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Intern feil" @@ -2047,7 +2059,7 @@ msgstr "Kan ikkje utfra mmap p ei tom fil" msgid "Couldn't make mmap of %lu bytes" msgstr "Klarte ikkje laga mmap av %lu byte" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Fann ikkje utvalet %s" @@ -2107,12 +2119,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s ... Ferdig" @@ -2244,108 +2256,110 @@ msgstr "Problem ved oppheving av lenkje til fila" msgid "Problem syncing the file" msgstr "Problem ved synkronisering av fila" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Tomt pakkelager" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Pakkelagerfila er ydelagd" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Versjonen til pakkelagerfila er ikkje kompatibel" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "APT stttar ikkje versjonssystemet %s" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Pakkelageret er bygd for ein annan arkitektur" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Krav" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Forkrav" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Forslag" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Tilrdingar" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Konflikt" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Byter ut" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Foreldar" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "viktig" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "pkravd" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "vanleg" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "valfri" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "tillegg" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Byggjer kravtre" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Kandidatversjonar" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Genererer kravforhold" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Flettar informasjon om tilgjengelege pakkar" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Klarte ikkje opna %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Klarte ikkje skriva fila %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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 "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Klarte ikkje tolka pakkefila %s (2)" @@ -2380,7 +2394,7 @@ msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" msgid "Opening %s" msgstr "Opnar %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Linja %u i kjeldelista %s er for lang." @@ -2468,7 +2482,7 @@ msgstr "Finn ikkje metodedrivaren %s." msgid "Method %s did not start correctly" msgstr "Metoden %s starta ikkje rett" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2476,12 +2490,12 @@ msgstr "" " %s\n" "i stasjonen %s og trykk Enter.\n" -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet %s er ikkje sttta" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype" @@ -2525,90 +2539,106 @@ msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem" msgid "Error occurred while processing %s (NewPackage)" msgstr "Feil ved behandling av %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Feil ved behandling av %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Feil ved behandling av %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Feil ved behandling av %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Feil ved behandling av %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Feil ved behandling av %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Feil ved behandling av %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Feil ved behandling av %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Feil ved behandling av %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Jss, du har overgtt talet p pakkenamn som APT kan handtera." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jss, du har overgtt talet p versjonar som APT kan handtera." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Jss, du har overgtt talet p versjonar som APT kan handtera." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jss, du har overgtt talet p krav som APT kan handtera." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Feil ved behandling av %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Feil ved behandling av %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Fann ikkje pakken %s %s ved behandling av filkrav" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Klarte ikkje f status p kjeldepakkelista %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Samlar inn filtilbod" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "IU-feil ved lagring av kjeldelager" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format 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:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 msgid "There are no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2617,7 +2647,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:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2625,14 +2655,14 @@ msgid "" msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv." -#: apt-pkg/acquire-item.cc:854 +#: apt-pkg/acquire-item.cc:1305 #, 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:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Feil storleik" @@ -2641,7 +2671,7 @@ msgstr "Feil storleik" msgid "Vendor block %s contains no fingerprint" msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2650,47 +2680,49 @@ msgstr "" "Brukar monteringspunktet %s for CD-ROM\n" "Monterer CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Identifiserer ... " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Lagra etikett: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Brukar monteringspunktet %s for CD-ROM\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Avmonterer CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Ventar p disk ...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Monterer CD-ROM ...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Leitar etter indeksfiler p disken ...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2699,38 +2731,38 @@ msgstr "" "Disken vert kalla: \n" "%s\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopierer pakkelister ..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Skriv ny kjeldeliste\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Kjeldelisteoppfringar for denne disken er:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Avmonterer CD-ROM ..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Skreiv %i postar.\n" -#: 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 "Skreiv %i postar med %i manglande filer.\n" -#: 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 "Skreiv %i postar med %i filer som ikkje passa\n" -#: 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 "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n" @@ -2785,10 +2817,19 @@ msgstr "Opnar oppsettsfila %s" msgid "Completely removed %s" msgstr "Klarte ikkje fjerna %s" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Klarte ikkje opna fila %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Sambandet vart uventa stengd" +#: apt-pkg/acquire-item.cc:1097 +msgid "There is no public key available for the following key IDs:\n" +msgstr "" + #~ msgid "File date has changed %s" #~ msgstr "Fildatoen er endra %s" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" +"POT-Creation-Date: 2006-08-15 15:55+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" @@ -14,147 +14,155 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakiet %s w wersji %s ma niespenione zalenoci:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Nie udao si odnale pakietu %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Liczba nazw pakietw : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Zwykych pakietw: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Czysto wirtualnych pakietw: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Pojedynczych pakietw wirtualnych: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Mieszanych pakietw wirtualnych: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Brakujcych: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "W sumie rnych wersji: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +msgid "Total Distinct Descriptions: " +msgstr "W sumie rnych opisw: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "W sumie zalenoci: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "W sumie zalenoci wersja/plik: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +msgid "Total Desc/File relations: " +msgstr "W sumie zalenoci opis/plik: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "W sumie mapowa zapewnie: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "W sumie dopasowanych napisw: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Sumaryczny rozmiar obszaru zalenoci od wersji: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Sumaryczny rozmiar niewykorzystanego miejsca: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Cakowity rozmiar: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Plik pakietu %s jest przestarzay." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Naley poda dokadnie jeden wzr" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Nie znaleziono adnych pakietw" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Plikw pakietw:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Magazyn podrczny jest przestarzay, nie mona odwoa si (x-ref) do pliku " "pakietu." -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Przypite pakiety:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(nieznaleziony)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Zainstalowana: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(brak)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Kandydujca: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Sposb przypicia: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Tabela wersji:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s dla %s %s skompilowany %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -303,7 +311,7 @@ msgstr "" " -c=? Czytaj ten plik konfiguracyjny.\n" " -o=? Ustaw dowoln opcj konfiguracji, np. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Nie udao si pisa do %s" @@ -747,118 +755,118 @@ msgstr "%lu usuwanych i %lu nieaktualizowanych.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu nie w peni zainstalowanych lub usunitych.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Naprawianie zalenoci..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " nie udao si." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Nie udao si naprawi zalenoci" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Nie udao si zminimalizowa zbioru aktualizacji" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Gotowe" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Naley uruchomi `apt-get -f install', aby je naprawi." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Niespenione zalenoci. Sprbuj uy -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UWAGA: Nastpujce pakiety nie mog zosta zweryfikowane!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Ostrzeenie uwierzytelniania zignorowano.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Zainstalowa te pakiety bez weryfikacji [t/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Niektre pakiety nie mogy zosta zweryfikowane" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Byy problemy, a uyto -y bez --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Bd wewntrzny, InstallPackages uyto z zepsutymi pakietami!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Pakiety powinny zosta usunite, ale Remove jest wyczone." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Bd wewntrzny, sortowanie niezakoczone" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Nie udao si zablokowa katalogu pobierania" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nie udao si odczyta list rde." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Dziwne.. rozmiary si nie zgadzaj, zgo pod apt@packages.debian.org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Konieczne pobranie %sB/%sB archiww.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Konieczne pobranie %sB archiww.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po rozpakowaniu zostanie dodatkowo uyte %sB miejsca na dysku.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozpakowaniu zostanie zwolnione %sB miejsca na dysku.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nie udao si ustali iloci wolnego miejsca w %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Niestety w %s nie ma wystarczajcej iloci wolnego miejsca." -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Nakazano wykonywa tylko trywialne operacje, a to nie jest trywialne." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Tak, rb jak mwi!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -869,28 +877,28 @@ msgstr "" "Aby kontynuowa wpisz zdanie '%s'\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Przerwane." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Czy chcesz kontynuowa [T/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie udao si pobra %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Nie udao si pobra niektrych plikw" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Ukoczono pobieranie w trybie samego pobierania" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -898,48 +906,48 @@ msgstr "" "Nie udao si pobra niektrych archiww, sprbuj uruchomi apt-get update " "lub uy opcji --fix-missing" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i zamienianie nonikw nie jest obecnie obsugiwane" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Nie udao si poprawi brakujcych pakietw." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Przerywanie instalacji" -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Uwaga, wybieranie %s zamiast %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Pomijanie %s, jest ju zainstalowane, a nie zostao wybrana aktualizacja.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakiet %s nie jest zainstalowany, wic nie zostanie usunity.\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakiet %s jest pakietem wirtualnym zapewnianym przez:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Zainstalowany]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Naley jednoznacznie wybra jeden z nich do instalacji." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -950,50 +958,50 @@ msgstr "" "Zazwyczaj oznacza to, e pakietu brakuje, zosta zastpiony przez inny\n" "pakiet lub nie jest dostpny przy pomocy obecnie ustawionych rde.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Jednak nastpujce pakiety go zastpuj:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakiet %s nie ma kandydata do instalacji" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Przeinstalowanie pakietu %s nie jest moliwe, nie moe on zosta pobrany.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s jest ju w najnowszej wersji.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Wydanie '%s' dla '%s' nie zostao znalezione" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Wersja '%s' dla '%s' nie zostaa znaleziona" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Wybrano wersj %s (%s) dla %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Polecenie update nie wymaga adnych argumentw" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Nie udao si zablokowa katalogu list" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1001,26 +1009,26 @@ msgstr "" "Nie udao si pobra niektrych plikw indeksu, zostay one zignorowane lub " "zostaa uyta ich starsza wersja." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "Nastpujce informacje mog pomc rozpozna sytuacj:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Bd wewntrzny, rozwizywanie problemw wszystko popsuo" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Bd wewntrzny, AllUpgrade wszystko popsuo" @@ -1565,9 +1573,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Pliki info i temp musz by na tym samym systemie plikw" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Czytanie list pakietw" @@ -1701,11 +1709,13 @@ msgid "File not found" msgstr "Nie odnaleziono pliku" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: 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:278 methods/gzip.cc:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Nie udao si ustawi czasu modyfikacji" @@ -1834,7 +1844,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Nie udao si obliczy skrtu pliku" @@ -1959,86 +1969,86 @@ msgstr "" "Nastpujce sygnatury nie mogy zosta zweryfikowane z powodu braku klucza " "publicznego:\n" -#: methods/gzip.cc:57 +#: 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: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:375 msgid "Waiting for headers" msgstr "Oczekiwanie na nagwki" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Nieprawidowa linia nagwka" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "Serwer HTTP przysa nieprawidowy nagwek odpowiedzi" -#: methods/http.cc:585 +#: methods/http.cc:584 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:599 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:601 msgid "This HTTP server has broken range support" msgstr "Ten serwer HTTP nieprawidowo obsuguje zakresy (ranges)" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Operacja select nie powioda si" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Przekroczenie czasu poczenia" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Bd przy pisaniu do pliku wyjciowego" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Bd przy pisaniu do pliku" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Bd przy pisaniu do pliku" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Bd czytania z serwera" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Bdne dane nagwka" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Poczenie nie udao si" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Bd wewntrzny" @@ -2051,7 +2061,7 @@ msgstr "Nie mona wykona mmap na pustym pliku" msgid "Couldn't make mmap of %lu bytes" msgstr "Nie udao si wykona mmap %lu bajtw" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Nie odnaleziono wyboru %s" @@ -2112,12 +2122,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Gotowe" @@ -2249,108 +2259,110 @@ msgstr "Problem przy usuwaniu pliku" msgid "Problem syncing the file" msgstr "Problem przy zapisywaniu pliku na dysk" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Pusty magazyn podrczny pakietw" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Magazyn podrczny pakietw jest uszkodzony" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Magazyn podrczny pakietw jest w niezgodnej wersji" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Ta wersja APT nie obsuguje systemu wersji '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Ten magazyn podrczny pakietw zosta zbudowany dla innej architektury" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Wymaga" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "PreWymaga" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Sugeruje" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Poleca" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Jest w konflikcie z" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Zastpuje" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Czyni zbdnym" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "wany" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "wymagany" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standardowy" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcjonalny" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "dodatkowy" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Budowanie drzewa zalenoci" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Kandydujce wersje" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Generowanie zalenoci" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "czenie informacji o dostpnych pakietach" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Nie udao si otworzy %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Nie udao si zapisa pliku %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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 "Nie udao si zanalizowa pliku pakietu %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nie udao si zanalizowa pliku pakietu %s (2)" @@ -2385,7 +2397,7 @@ msgstr "Nieprawidowa linia %lu w licie rde %s (analiza dystrybucji)" msgid "Opening %s" msgstr "Otwieranie %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u w licie rde %s jest zbyt duga." @@ -2473,17 +2485,17 @@ msgstr "Nie udao si odnale sterownika metody %s." msgid "Method %s did not start correctly" msgstr "Metoda %s nie uruchomia si poprawnie." -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "W do napdu '%s' dysk o nazwie: '%s' i nacinij enter." -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "System pakietw '%s' nie jest obsugiwany" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Nie udao si okreli odpowiedniego typu systemu pakietw" @@ -2526,93 +2538,109 @@ msgstr "Magazyn podrczny ma niezgodny system wersji" msgid "Error occurred while processing %s (NewPackage)" msgstr "Wystpi bd podczas przetwarzania %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Wystpi bd podczas przetwarzania %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Wystpi bd podczas przetwarzania %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Wystpi bd podczas przetwarzania %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Wystpi bd podczas przetwarzania %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Wystpi bd podczas przetwarzania %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Wystpi bd podczas przetwarzania %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Wystpi bd podczas przetwarzania %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Wystpi bd podczas przetwarzania %s (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Och, przekroczono liczb pakietw, ktr ten APT jest w stanie obsuy." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Och, przekroczono liczb wersji, ktr ten APT jest w stanie obsuy." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Och, przekroczono liczb opisw, ktr ten APT jest w stanie obsuy." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Och, przekroczono liczb zalenoci, ktr ten APT jest w stanie obsuy." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Wystpi bd podczas przetwarzania %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Wystpi bd podczas przetwarzania %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakiet %s %s nie zosta odnaleziony podczas przetwarzania zalenoci plikw" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nie udao si wykona operacji stat na licie pakietw rdowych %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Zbieranie zapewnie plikw" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "Bd wejcia/wyjcia przy zapisywaniu podrcznego magazynu rde" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format 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:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "Bdna suma MD5" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" msgstr "Dla nastpujcego identyfikatora klucza brakuje klucza publicznego:\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2621,7 +2649,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:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2630,14 +2658,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:854 +#: apt-pkg/acquire-item.cc:1305 #, 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:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Bdny rozmiar" @@ -2646,7 +2674,7 @@ msgstr "Bdny rozmiar" msgid "Vendor block %s contains no fingerprint" msgstr "Blok producenta %s nie zawiera odcisku" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2655,49 +2683,51 @@ msgstr "" "Wykorzystu %s jako punkt montowania CD-ROMu\n" "Montowanie CD-ROMu\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Identyfikacja.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Etykieta: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Wykorzystuj %s jako punkt montowania CD-ROMu\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Odmontowanie CD-ROMu\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Oczekiwanie na pyt...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Montowanie CD-ROMu...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Skawnowanie pyty w poszukiwaniu plikw indeksu..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" "Znaleziono %i indeksw pakietw, %i indeksw rdowych, %i indeksw " "tumacze i %i sygnatur\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2706,38 +2736,38 @@ msgstr "" "Pyta nosi nazw: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopiowanie list pakietw..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Zapisywanie nowej listy rde\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "rda dla tej pyty to:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Odmontowanie CD-ROMu..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Zapisano %i rekordw.\n" -#: 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 "Zapisano %i rekordw z %i brakujcymi plikami.\n" -#: 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 "Zapisano %i rekordw z %i niepasujcymi plikami\n" -#: 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 "Zapisano %i rekordw z %i brakujcymi plikami i %i niepasujcymi\n" @@ -2792,10 +2822,19 @@ msgstr "Przygotowanie do konfiguracji %s" msgid "Completely removed %s" msgstr "Nie udao si usun %s" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Nie udao si naoy atki na plik" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Poczenie zostao zamknite przedwczenie" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +msgid "There is no public key available for the following key IDs:\n" +msgstr "Dla nastpujcego identyfikatora klucza brakuje klucza publicznego:\n" + #~ msgid "File date has changed %s" #~ msgstr "Data pliku ulega zmianie %s" @@ -2810,22 +2849,3 @@ msgstr "Poczenie zostao zamknite przedwczenie" #~ msgid "Removed with config %s" #~ msgstr "Usunito %s wraz z konfiguracj" - -#~ msgid "Total Distinct Descriptions: " -#~ msgstr "W sumie rnych opisw: " - -#~ msgid "Total Desc/File relations: " -#~ msgstr "W sumie zalenoci opis/plik: " - -#~ msgid "Error occured while processing %s (NewFileDesc1)" -#~ msgstr "Wystpi bd podczas przetwarzania %s (NewFileDesc1)" - -#~ msgid "Error occured while processing %s (NewFileDesc2)" -#~ msgstr "Wystpi bd podczas przetwarzania %s (NewFileDesc2)" - -#~ msgid "Wow, you exceeded the number of descriptions this APT is capable of." -#~ msgstr "" -#~ "Och, przekroczono liczb opisw, ktr ten APT jest w stanie obsuy." - -#~ msgid "Could not patch file" -#~ msgstr "Nie udao si naoy atki na plik" @@ -1,158 +1,170 @@ # Debian-PT translation for apt. # Copyright (C) 2004 Free Software Foundation, Inc. # Miguel Figueiredo <elmig@debianpt.org>, 2005, 2006. +# +# msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" -"PO-Revision-Date: 2005-03-07 22:20+0000\n" +"POT-Creation-Date: 2006-08-15 15:55+0200\n" +"PO-Revision-Date: 2006-10-14 21:55+0100\n" "Last-Translator: Rui Az. <astronomy@mail.pt>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "O pacote %s versão %s tem uma dependência não satisfeita:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Total de Nomes de Pacotes : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Pacotes Normais: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Pacotes Puramente Virtuais: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Pacotes Virtuais Únicos: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Pacotes Virtuais Misturados: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Faltam: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Total de Versões Distintas: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Total de Versões Distintas: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Total de Dependências: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Total de relações Ver/Ficheiro: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Total de relações Ver/Ficheiro: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Total de Mapeamentos Disponibilizados: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Total de Strings Globbed: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Total de espaço de Dependência de Versão: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Total de espaço Desperdiçado: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Total de Espaço Contabilizado: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "O ficheiro do pacote %s está dessincronizado." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Você deve dar exactamente um pattern" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Não foi encontrado nenhum pacote" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Ficheiros de Pacotes :" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "A cache está dessincronizada, não pode x-referenciar um ficheiro de pacote" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Pacotes Marcados: " -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(não encontrado)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Instalado: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(nenhum)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Marcação do Pacote: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Tabela de Versão:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado em %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -301,7 +313,7 @@ msgstr "" " -c=? Ler este arquivo de configuração\n" " -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Impossível escrever para %s" @@ -439,6 +451,8 @@ 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 @@ -535,14 +549,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " maintainer de %s é %s, não %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s não possui entrada override\n" +msgstr " %s não possui fonte de entrada de 'override'\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s não possui entrada override\n" +msgstr " %s não possui de igual modo entrada binária de 'override'\n" #: ftparchive/contents.cc:317 #, c-format @@ -744,120 +758,120 @@ msgstr "%lu a remover e %lu não actualizados.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Corrigindo dependências..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " falhou." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Impossível corrigir dependências" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Impossível minimizar o conjunto de actualizações" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Feito" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Você pode querer executar `apt-get -f install' para corrigir isso." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Dependências não satisfeitas. Tente utilizar -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: Os seguintes pacotes não podem ser autenticados" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Aviso de autenticação ultrapassado.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Instalar estes pacotes sem verificação [y/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Alguns pacotes não puderam ser autenticados" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Há problemas e -y foi usado sem --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Erro Interno, Ordering não terminou" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Impossível criar lock no directório de download" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A lista de fontes não pôde ser lida." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Estranho.. Os tamanhos não coincidiram, escreva para apt@packages.debian.org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "É necessário fazer o download de %sB/%sB de arquivos.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "É necessário fazer o download de %sB de arquivos.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Depois de descompactar, %sB adicionais de espaço em disco serão utilizados.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossível de determinar espaço livre em %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, 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:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only especificado mas essa não é uma operação trivial." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Sim, faça como eu digo!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -868,28 +882,28 @@ msgstr "" "Para continuar escreva a frase '%s'\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Abortado." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Você deseja continuar [Y/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao obter %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de apenas download" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -897,47 +911,47 @@ msgstr "" "Impossível obter alguns arquivos, execute talvez apt-get update ou tente com " "--fix-missing?" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mídia não são suportados actualmente" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Impossível corrigir os pacotes em falta." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Abortando a Instalação." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, seleccionando %s em vez de %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Saltando %s, já está instalado e a actualização não está definida.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "O pacote %s não está instalado, então não será removido\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O pacote %s é um pacote virtual disponibilizado por:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Você deve seleccionar explicitamente um para instalar." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -948,51 +962,51 @@ msgstr "" "Isso pode significar que o pacote falta, ficou obsoleto ou\n" "está disponível somente a partir de outra fonte\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "No entanto, os seguintes pacotes substituem-no:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "O pacote %s não tem candidato para instalação" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "A reinstalação de %s não é possível, o download do mesmo não pode ser " "feito.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s já é a versão mais recente.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para '%s' não foi encontrado" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versão '%s' para '%s' não foi encontrada" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versão seleccionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Impossível criar lock no directório de listas" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1000,26 +1014,26 @@ msgstr "" "Falhou o download de alguns ficheiros de índice, foram ignorados ou os " "antigos foram usados em seu lugar." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "A seguinte informação pode ajudar a resolver a situação:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Erro Interno, o solucionador de problemas estragou coisas" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" @@ -1565,9 +1579,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Os directórios info e temp precisam estar no mesmo sistema de arquivos" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "A Ler Listas de Pacotes" @@ -1701,11 +1715,13 @@ 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/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: methods/gzip.cc:141 methods/gzip.cc:150 msgid "Failed to stat" msgstr "Falha ao executar stat" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Falha ao definir hora de modificação" @@ -1833,7 +1849,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do ficheiro" @@ -1918,9 +1934,9 @@ msgid "Unable to connect to %s %s:" msgstr "Impossível ligar a %s %s:" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, 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:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." @@ -1939,9 +1955,11 @@ msgid "At least one invalid signature was encountered." msgstr "Pelo menos uma assinatura inválida foi encontrada." #: methods/gpgv.cc:213 -#, fuzzy, c-format +#, 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:218 msgid "Unknown error executing gpgv" @@ -1959,86 +1977,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: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: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:375 msgid "Waiting for headers" msgstr "Aguardando por cabeçalhos" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Linha de cabeçalho errada" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 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:584 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:599 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:601 msgid "This HTTP server has broken range support" msgstr "Este servidor http possui suporte a range errado" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Select falhou." -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "A ligação expirou" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Erro gravando para ficheiro de saída" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Erro gravando para ficheiro" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Erro gravando para o ficheiro" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Falhou a ligação" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Erro interno" @@ -2051,7 +2069,7 @@ msgstr "Não é possível fazer mmap a um ficheiro vazio" msgid "Couldn't make mmap of %lu bytes" msgstr "Impossível fazer mmap de %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Selecção %s não encontrada" @@ -2112,12 +2130,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Pronto" @@ -2250,108 +2268,110 @@ msgstr "Problema removendo o link ao ficheiro" msgid "Problem syncing the file" msgstr "Problema sincronizando o ficheiro" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cache de pacotes vazia" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "O ficheiro de cache de pacotes está corrompido" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "O ficheiro de cache de pacotes é de uma versão incompatível" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Este APT não suporta o Sistema de Versões '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "A cache de pacotes foi gerada para uma arquitectura diferente" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Pré-Depende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Sugere" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recomenda" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Em Conflito" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Substitui" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Obsoleta" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "requerido" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "padrão" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Construindo Árvore de Dependências" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Versões Candidatas" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Geração de Dependência" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Juntando informação Disponível" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Falhou ao abrir %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Falha ao escrever ficheiro %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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 o parse ao ficheiro de pacote %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 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)" @@ -2386,7 +2406,7 @@ msgstr "Linha malformada %lu na lista de fontes %s (dist parse)" msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u é demasiado longa na lista de fontes %s." @@ -2456,14 +2476,14 @@ 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 +#, 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 +#, 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 @@ -2475,18 +2495,18 @@ msgstr "O driver do método %s não pôde ser encontrado." msgid "Method %s did not start correctly" msgstr "Método %s não iniciou corretamente" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter." -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistema de empacotamento '%s' não é suportado" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "" "Não foi possível determinar um tipo de sistema de empacotamento aplicável" @@ -2532,97 +2552,115 @@ msgstr "A Cache possui um sistema de versões incompatível" msgid "Error occurred while processing %s (NewPackage)" msgstr "Um erro ocorreu ao processar %s (NovoPacote)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Um erro ocorreu ao processar %s (UsePacote1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Um erro ocorreu ao processar %s (UsePacote2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Um erro ocorreu ao processar %s (NovaVersão1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Um erro ocorreu ao processar %s (UsePacote3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Um erro ocorreu ao processar %s (NovaVersão2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Uau, você excedeu o número de nomes de pacotes que este APT é capaz de " "suportar." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Uau, você excedeu o número de versões que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Uau, você excedeu o número de versões que este APT é capaz de suportar." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Uau, você excedeu o número de dependências que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Um erro ocorreu ao processar %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "O pacote %s %s não foi encontrado ao processar as dependências de ficheiros" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Obtendo File Provides" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar a cache de código fonte" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "falhou renomear, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" msgstr "" "Não existe qualquer chave pública disponível para as seguintes IDs de " "chave:\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2632,7 +2670,7 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitectura " "não especificada)." -#: apt-pkg/acquire-item.cc:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2641,7 +2679,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:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2649,7 +2687,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Tamanho incorrecto" @@ -2658,7 +2696,7 @@ msgstr "Tamanho incorrecto" msgid "Vendor block %s contains no fingerprint" msgstr "O bloco de fabricante %s não contém a impressão digital" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2667,47 +2705,49 @@ msgstr "" "Utilizando o ponto de montagem do CD-ROM %s\n" "A montar o CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "A identificar.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Label Guardada: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "A utilizar o mount point do CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "A desmontar o CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "A aguardar pelo disco...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "A montar o CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "A pesquisar os ficheiros de index do Disco..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation 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:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2716,38 +2756,38 @@ msgstr "" "Este Disco tem o nome: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "A copiar listas de pacotes..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "A escrever lista de novas source\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 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 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "A desmontar o CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Escreveu %i registos.\n" -#: 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 "Escreveu %i registos com %i ficheiros em falta.\n" -#: 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 "Escreveu %i registos com %i ficheiros não coincidentes\n" -#: 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 "" @@ -2795,19 +2835,31 @@ 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/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Não foi possível abrir ficheiro o %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexão encerrada prematuramente" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +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" + #~ msgid "File date has changed %s" #~ msgstr "Data do ficheiro mudou %s" @@ -2835,9 +2887,6 @@ msgstr "Conexão encerrada prematuramente" #~ msgid "Error occured while processing %s (UsePackage2)" #~ msgstr "Um erro ocorreu ao processar %s (UsePacote2)" -#~ msgid "Error occured while processing %s (NewFileVer1)" -#~ msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" - #~ msgid "Error occured while processing %s (NewVersion1)" #~ msgstr "Um erro ocorreu ao processar %s (NovaVersão1)" diff --git a/po/pt_BR.po b/po/pt_BR.po index 7b4985337..343a6ec61 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,160 +1,169 @@ -# Debian-BR translation for apt. +# Brazilian Portuguese translation for apt. # Copyright (C) 2002 Free Software Foundation, Inc. # Gustavo Noronha Silva <kov@debian.org>, 2002. -# Andr Lus 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-08-09 23:46+0200\n" -"PO-Revision-Date: 2006-02-11 17:57-0200\n" -"Last-Translator: Andr Lus Lopes <andrelop@debian.org>\n" -"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n" +"POT-Creation-Date: 2006-08-15 15:55+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" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "O pacote %s verso %s tem uma dependncia desencontrada:\n" +msgstr "O pacote %s versão %s tem uma dependência desencontrada:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" -msgstr "Impossvel encontrar o pacote %s" +msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Total de Nomes de Pacotes : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " -msgstr " Pacotes Normais: " +msgstr " Pacotes normais: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " -msgstr " Pacotes Puramente Virtuais: " +msgstr " Pacotes puramente virtuais: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " -msgstr " Pacotes Virtuais nicos: " +msgstr " Pacotes virtuais únicos: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " -msgstr " Pacotes Virtuais Misturados: " +msgstr " Pacotes virtuais misturados: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Faltando: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " -msgstr "Total de Verses Distintas: " +msgstr "Total de versões distintas: " + +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Total de versões distintas: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " -msgstr "Total de Dependncias: " +msgstr "Total de dependências: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " -msgstr "Total de relaes Ver/Arquivo: " +msgstr "Total de relações ver/arquivo: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Total de relações ver/arquivo: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " -msgstr "Total de Mapeamentos Providos: " +msgstr "Total de mapeamentos Provides: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " -msgstr "Total de Strings Globbed: " +msgstr "Total de strings globbed: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " -msgstr "Total de espao de Dependncia de Verso: " +msgstr "Total de espaço de dependência de versão: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " -msgstr "Total de espao Frouxo: " +msgstr "Total de espaço frouxo: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " -msgstr "Total de Espao Contado: " +msgstr "Total de espaço contabilizado: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." -msgstr "O arquivo de pacote %s est dessincronizado." +msgstr "O arquivo de pacote %s está dessincronizado." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" -msgstr "Voc deve passar exatamente um padro" +msgstr "Você deve passar exatamente um padrão" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" -msgstr "Nenhum pacote encotrado" +msgstr "Nenhum pacote encontrado" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" -msgstr "Arquivos de Pacotes :" +msgstr "Arquivos de pacote:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "" -"O cache est fora de sincronia, no posso x-refenciar um arquivo de pacote" +msgstr "O cache está fora de sincronia, não posso x-ref um arquivo de pacote" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" -msgstr "Pacotes Pinados: " +msgstr "Pacotes pinados:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" -msgstr "(no encontrado)" +msgstr "(não encontrado)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Instalado: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(nenhum)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " -msgstr " Candidatos: " +msgstr " Candidato: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " -msgstr " Pin do Pacote: " +msgstr " Pin do pacote: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" -msgstr " Tabela de Verso:" +msgstr " Tabela de versão:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado em %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -192,47 +201,48 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -"Uso: apt-cache [opes] comando\n" -" apt-cache [opes] add arquivo1 [arquivo1 ...]\n" -" apt-cache [opes] showpkg pacote1 [pacote2 ...]\n" -" apt-cache [opes] showsrc pacote1 [pacote2 ...]\n" +"Uso: apt-cache [opções] comando\n" +" apt-cache [opções] add arquivo1 [arquivo1 ...]\n" +" apt-cache [opções] showpkg pacote1 [pacote2 ...]\n" +" apt-cache [opções] showsrc pacote1 [pacote2 ...]\n" "\n" -"O apt-cache uma ferramenta de baixo nvel usada para manipular\n" -"os arquivos de cache binrios do APT e para buscar informaes\n" +"O apt-cache é uma ferramenta de baixo nível usada para manipular\n" +"os arquivos de cache binários do APT e para buscar informações\n" "neles\n" "\n" "Comandos:\n" " add - Adiciona um arquivo de pacote ao cache de fontes\n" -" gencaches - Constri ambos os caches de pacotes e fontes\n" -" showpkg - Mostra informaes gerais sobre um pacote\n" +" gencaches - Constrói ambos os caches de pacotes e fontes\n" +" showpkg - Mostra informações gerais sobre um pacote\n" " showsrc - Mostra registros fontes\n" -" stats - Mostra estatsticas bsicas\n" +" stats - Mostra estatísticas básicas\n" " dump - Mostra o arquivo inteiro em uma forma concisa\n" -" dumpavail - Imprime um arquivo de disponveis para stdout\n" -" unmet - Mostra dependncias no satisfeitas (quebradas)\n" -" search - Procura a lista de pacotes por um padro regex\n" -" show - Mostra um registro legvel sobre o pacote\n" -" depends - Mostra informaes cruas de dependncias de um pacote\n" +" dumpavail - Imprime um arquivo \"available\" para stdout\n" +" unmet - Mostra dependências não satisfeitas (quebradas)\n" +" search - Procura a lista de pacotes por um padrão regex\n" +" show - Mostra um registro legível sobre o pacote\n" +" depends - Mostra informações cruas de dependências de um pacote\n" +" rdepends - Mostra informações de dependências reversas de um pacote\n" " pkgnames - Lista o nome de todos os pacotes\n" -" dotty - Gera grficos de pacotes para o GraphVis\n" -" xvcg - Gera grficos de pacotes para o xvcg\n" -" policy - Mostra as configuraes de polticas\n" +" dotty - Gera gráficos de pacotes para o GraphVis\n" +" xvcg - Gera gráficos de pacotes para o xvcg\n" +" policy - Mostra as configurações de políticas\n" "\n" -"Opes:\n" +"Opções:\n" " -h Esse texto de ajuda.\n" " -p=? O cache de pacotes.\n" " -s=? O cache de fontes.\n" " -q Desabilita o indicador de progresso.\n" -" -i Mostra apenas dependncias importantes para o comando unmet.\n" -" -c=? Ler arquivo de configurao especificado.\n" -" -o=? Define uma opo arbitrria de configurao, ex: -o dir::cache=/tmp\n" -"Veja as pginas de manual apt-cache(8) e apt.conf(5) para maiores " -"informaes.\n" +" -i Mostra apenas dependências importantes para o comando unmet.\n" +" -c=? Ler arquivo de configuração especificado.\n" +" -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" +"Veja as páginas de manual apt-cache(8) e apt.conf(5) para maiores " +"informações.\n" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" msgstr "" -"Por favor, fornea um nome para este Disco, como 'Debian 2.1r1 Disco 1'" +"Por favor, forneça um nome para este Disco, como 'Debian 2.1r1 Disco 1'" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" @@ -240,11 +250,11 @@ msgstr "Por favor, insira um Disco no leitor e pressione enter" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "Pepita este processo para o restante dos CDs em seu conjunto." +msgstr "Repita este processo para o restante dos CDs em seu conjunto." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" -msgstr "Argumentos no esto em pares" +msgstr "Argumentos não estão em pares" #: cmdline/apt-config.cc:76 msgid "" @@ -261,24 +271,24 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Uso: apt-config [opes] comando\n" +"Uso: apt-config [opções] comando\n" "\n" -"O apt-config uma ferramenta simples para ler o arquivo de configurao\n" +"O apt-config é uma ferramenta simples para ler o arquivo de configuração\n" "do APT\n" "\n" "Comandos:\n" -" shell - Modo Shell\n" -" dump - Mostra a configurao\n" +" shell - Modo shell\n" +" dump - Mostra a configuração\n" "\n" -"Opes:\n" +"Opções:\n" " -h Esse texto de ajuda.\n" -" -c=? Ler esse arquivo de configurao\n" -" -o=? Define uma opo arbitrria de configurao, ex: -o dir::cache=/tmp\n" +" -c=? Ler esse arquivo de configuração\n" +" -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format msgid "%s not a valid DEB package." -msgstr "%s no um pacote DEB vlido." +msgstr "%s não é um pacote DEB válido." #: cmdline/apt-extracttemplates.cc:232 msgid "" @@ -295,47 +305,47 @@ msgid "" msgstr "" "Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n" "\n" -"O apt-extracttemplates uma ferramenta para extrair configurao\n" -"e informao de template de pacotes debian.\n" +"O apt-extracttemplates é uma ferramenta para extrair configuração\n" +"e informação de modelo (\"template\") de pacotes debian.\n" "\n" -"Opes:\n" +"Opções:\n" " -h Esse texto de ajuda\n" -" -t Define o diretrio temporrio\n" -" -c=? Ler esse arquivo de configurao\n" -" -o=? Define uma opo arbitrria de configurao, ex: -o dir::cache=/tmp\n" +" -t Define o diretório temporário\n" +" -c=? Ler esse arquivo de configuração\n" +" -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" -msgstr "Impossvel escrever para %s" +msgstr "Impossível escrever para %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "No foi possvel conseguir a verso do debconf. Ele est instalado?" +msgstr "Não foi possível obter a versão do debconf. O debconf está instalado?" #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" -msgstr "Lista de extenso de pacotes muito extensa" +msgstr "Lista de extensão de pacotes é muito extensa" #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" -msgstr "Erro processando o diretrio %s" +msgstr "Erro processando o diretório %s" #: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" -msgstr "Lista de extenso de fontes muito extensa" +msgstr "Lista de extensão de fontes é muito extensa" #: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" -msgstr "Erro ao gravar cabealho no arquivo de contedo" +msgstr "Erro ao gravar cabeçalho no arquivo de conteúdo" #: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" -msgstr "Erro processando Contedo %s" +msgstr "Erro processando conteúdo %s" #: ftparchive/apt-ftparchive.cc:556 msgid "" @@ -378,75 +388,77 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" msgstr "" -"Uso: apt-ftparchive [opes] comando\n" -"Comandos: packages caminho_binrio [arquivo_override [prefixo_caminho]]\n" +"Uso: apt-ftparchive [opções] comando\n" +"Comandos: packages caminho_binário [arquivo_override [prefixo_caminho]]\n" " sources caminho_fonte [arquivo_override [prefixo_caminho]]\n" " contents caminho\n" " release caminho\n" " generate config [grupos]\n" " clean config\n" "\n" -"O apt-ftparchive gera arquivos de ndice para repositrios Debian. Ele \n" -"suporta muitos estilos de gerao, desde totalmente automatizadas at \n" +"O apt-ftparchive gera arquivos de índice para repositórios Debian. Ele \n" +"suporta muitos estilos de geração, desde totalmente automatizadas até \n" "substitutos funcionais para o dpkg-scanpackages e dpkg-scansources\n" "\n" -"O apt-ftparchive gera arquivos Package a partir de uma rvore de .debs.\n" -" O arquivo Package contm o contedo de todos os campos control de \n" +"O apt-ftparchive gera arquivos Package a partir de uma árvore de .debs. \n" +"O arquivo Package contém o conteúdo de todos os campos control de \n" "cada pacote bem como o hash MD5 e tamanho de arquivo. Um arquivo \n" -"override suportado para forar o valor de Priority e Section.\n" +"override é suportado para forçar o valor de Priority e Section.\n" "\n" "Similarmente, o apt-ftparchive gera arquivos Sources a partir de uma \n" -"rvore de .dscs. A opo --source-override pode ser usada para \n" +"árvore de .dscs. A opção --source-override pode ser usada para \n" "especificar um arquivo override de fontes\n" "\n" -"Os comandos 'packages' e 'sources' devem ser executados na raz da \n" -"rvore. CaminhoBinrio deve apontar para a base de procura recursiva \n" -"e o arquivo override deve conter as flags override. CaminhoPrefixo \n" -"includo aos campos filename caso esteja presente. Exemplo de uso do \n" -"repositrio Debian :\n" +"Os comandos 'packages' e 'sources' devem ser executados na raiz da \n" +"árvore. CaminhoBinário deve apontar para a base de procura recursiva \n" +"e o arquivo override deve conter as flags override. CaminhoPrefixo é \n" +"incluído aos campos filename caso esteja presente. Exemplo de uso do \n" +"repositório Debian:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" "\n" -"Opes:\n" +"Opções:\n" " -h Este texto de ajuda\n" -" --md5 Controla a gerao de MD5\n" +" --md5 Controla a geração de MD5\n" " -s=? Arquivo fonte (source) override\n" " -q Quieto\n" " -d=? Seleciona a base de dados de caching opcional\n" -" --no-delink Habilita o modo de depurao delinking\n" -" --contents Controla a gerao do arquivo de contedo\n" -" -c=? L este arquivo de configurao\n" -" -o=? Define uma opo de configurao arbitrria" +" --no-delink Habilita o modo de depuração delinking\n" +" --contents Controla a geração do arquivo de conteúdo\n" +" -c=? Lê este arquivo de configuração\n" +" -o=? Define uma opção de configuração arbitrária" #: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" -msgstr "Nenhuma seleo correspondente" +msgstr "Nenhuma seleção correspondente" #: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Alguns arquivos esto faltando no arquivo de grupo de pacotes `%s'" +msgstr "Alguns arquivos estão faltando no arquivo de grupo de pacotes `%s'" #: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "A base de dados estava corrompida, arquivo renomeado para %s.old" +msgstr "BD estava corrompido, arquivo renomeado para %s.old" #: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "DB antigo, tentando atualizar %s" +msgstr "BD é antigo, tentando atualizar %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 "" +"Formato do BD é inválido. Se você atualizou a partir de uma versão antiga do " +"apt, por favor remova e recrie o banco de dados." #: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "Impossvel abrir arquivo DB %s : %s" +msgstr "Impossível abrir arquivo BD %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 @@ -456,21 +468,21 @@ msgstr "Falha ao checar %s" #: ftparchive/cachedb.cc:242 msgid "Archive has no control record" -msgstr "Repositrio no possui registro de controle" +msgstr "Repositório não possui registro de controle" #: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" -msgstr "Impossvel obter um cursor" +msgstr "Impossível obter um cursor" #: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" -msgstr "W: Impossvel ler o diretrio %s\n" +msgstr "W: Impossível ler o diretório %s\n" #: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" -msgstr "W: Impossvel checar %s\n" +msgstr "W: Impossível checar %s\n" #: ftparchive/writer.cc:135 msgid "E: " @@ -491,7 +503,7 @@ msgstr "Falha ao resolver %s" #: ftparchive/writer.cc:173 msgid "Tree walking failed" -msgstr "Falha ao percorrer a rvore" +msgstr "Falha ao percorrer a árvore" #: ftparchive/writer.cc:198 #, c-format @@ -525,41 +537,41 @@ msgstr " Limite DeLink de %sB atingido.\n" #: ftparchive/writer.cc:390 msgid "Archive had no package field" -msgstr "Repositrio no possua campo pacote" +msgstr "Repositório não possuía campo pacote" #: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" -msgstr " %s no possui entrada override\n" +msgstr " %s não possui entrada override\n" #: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" -msgstr " mantenedor de %s %s, no %s\n" +msgstr " mantenedor de %s é %s, não %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s no possui entrada override\n" +msgstr " %s não possui entrada source override\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s no possui entrada override\n" +msgstr " %s também não possui entrada binary override\n" #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" -msgstr "Erro Interno, no foi possvel localizar membro %s" +msgstr "Erro interno, não foi possível localizar membro %s" #: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" -msgstr "realloc - Falha ao alocar memria" +msgstr "realloc - Falha ao alocar memória" #: ftparchive/override.cc:38 ftparchive/override.cc:146 #, c-format msgid "Unable to open %s" -msgstr "Impossvel abrir %s" +msgstr "Impossível abrir %s" #: ftparchive/override.cc:64 ftparchive/override.cc:170 #, c-format @@ -584,12 +596,12 @@ msgstr "Falha ao ler o arquivo override %s" #: ftparchive/multicompress.cc:75 #, c-format msgid "Unknown compression algorithm '%s'" -msgstr "Algoritmo de Compactao Desconhecido '%s'" +msgstr "Algoritmo de compactação desconhecido '%s'" #: ftparchive/multicompress.cc:105 #, c-format msgid "Compressed output %s needs a compression set" -msgstr "Sada compactada %s precisa de um conjunto de compresso" +msgstr "Saída compactada %s precisa de um conjunto de compactação" #: ftparchive/multicompress.cc:172 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" @@ -605,12 +617,12 @@ msgstr "Falha oa executar fork" #: ftparchive/multicompress.cc:215 msgid "Compress child" -msgstr "Compactar Filho" +msgstr "Compactar filho" #: ftparchive/multicompress.cc:238 #, c-format msgid "Internal error, failed to create %s" -msgstr "Erro Interno, Falha ao criar %s" +msgstr "Erro interno, falha ao criar %s" #: ftparchive/multicompress.cc:289 msgid "Failed to create subprocess IPC" @@ -630,7 +642,7 @@ msgstr "IO para subprocesso/arquivo falhou" #: ftparchive/multicompress.cc:458 msgid "Failed to read while computing MD5" -msgstr "Falha ao ler durante o clculo MD5" +msgstr "Falha ao ler durante o cálculo MD5" #: ftparchive/multicompress.cc:475 #, c-format @@ -649,37 +661,37 @@ msgstr "S" #: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574 #, c-format msgid "Regex compilation error - %s" -msgstr "Erro de compilao de regex - %s" +msgstr "Erro de compilação de regex - %s" #: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" -msgstr "Os pacotes a seguir tm dependncias desencontradas:" +msgstr "Os pacotes a seguir têm dependências desencontradas:" #: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" -msgstr "mas %s est instalado" +msgstr "mas %s está instalado" #: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" -msgstr "mas %s est para ser instalado" +msgstr "mas %s está para ser instalado" #: cmdline/apt-get.cc:337 msgid "but it is not installable" -msgstr "mas no est instalvel" +msgstr "mas não está instalável" #: cmdline/apt-get.cc:339 msgid "but it is a virtual package" -msgstr "mas um pacote virtual" +msgstr "mas é um pacote virtual" #: cmdline/apt-get.cc:342 msgid "but it is not installed" -msgstr "mas no est instalado" +msgstr "mas não está instalado" #: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" -msgstr "mas no vai ser instalado" +msgstr "mas não vai ser instalado" #: cmdline/apt-get.cc:347 msgid " or" @@ -687,27 +699,27 @@ msgstr " ou" #: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" -msgstr "Os NOVOS pacotes a seguir sero instalados:" +msgstr "Os NOVOS pacotes a seguir serão instalados:" #: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" -msgstr "Os pacotes a seguir sero REMOVIDOS:" +msgstr "Os pacotes a seguir serão REMOVIDOS:" #: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" -msgstr "Os pacotes a seguir sero mantidos em suas verses atuais :" +msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:" #: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" -msgstr "Os pacotes a seguir sero atualizados :" +msgstr "Os pacotes a seguir serão atualizados:" #: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" -msgstr "Os pacotes a seguir sero REBAIXADOS de verso :" +msgstr "Os pacotes a seguir serão REVERTIDOS:" #: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" -msgstr "Os pacotes segurados a seguir sero mudados :" +msgstr "Os seguintes pacotes mantidos serão mudados:" #: cmdline/apt-get.cc:539 #, c-format @@ -719,9 +731,9 @@ msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"AVISO: Os pacotes essenciais a seguir sero removidos.\n" -"Isso NO deveria ser feito a menos que voc saiba exatamente o que voc est " -"fazendo !" +"AVISO: Os pacotes essenciais a seguir serão removidos.\n" +"Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está " +"fazendo!" #: cmdline/apt-get.cc:578 #, c-format @@ -741,312 +753,311 @@ msgstr "%lu desatualizados, " #: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu a serem removidos e %lu no atualizados.\n" +msgstr "%lu a serem removidos e %lu não atualizados.\n" #: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu pacotes no totalmente instalados ou removidos.\n" +msgstr "%lu pacotes não totalmente instalados ou removidos.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." -msgstr "Corrigindo dependncias..." +msgstr "Corrigindo dependências..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " falhou." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" -msgstr "Impossvel corrigir dependncias" +msgstr "Impossível corrigir dependências" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" -msgstr "Impossvel minimizar o conjunto de atualizaes" +msgstr "Impossível minimizar o conjunto de atualizações" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Pronto" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Voc pode querer rodar `apt-get -f install' para corrigir isso." +msgstr "Você pode querer rodar `apt-get -f install' para corrigir isso." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." -msgstr "Dependncias desencontradas. Tente usar -f." +msgstr "Dependências desencontradas. Tente usar -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "AVISO : Os pacotes a seguir no podem ser autenticados !" +msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" -msgstr "Aviso de autenticao sobrescrito.\n" +msgstr "Aviso de autenticação sobrescrito.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " -msgstr "Instalar estes pacotes sem verificao [s/N] ? " +msgstr "Instalar estes pacotes sem verificação [s/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" -msgstr "Alguns pacotes no puderam ser autenticados" +msgstr "Alguns pacotes não puderam ser autenticados" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" -msgstr "H problemas e -y foi usado sem --force-yes" +msgstr "Há problemas e -y foi usado sem --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Erro Interno, Install Packages foi chamado com pacotes quebrados !" +msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." -msgstr "Pacotes precisam ser removidos mas a remoo est desabilitada." +msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" -msgstr "Erro Interno, Ordenao no finalizou" +msgstr "Erro interno, Ordenação não finalizou" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" -msgstr "Impossvel criar lock no diretrio de download" +msgstr "Impossível criar lock no diretório de download" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." -msgstr "A lista de fontes no pde ser lida." +msgstr "A lista de fontes não pôde ser lida." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "Que estranho .. Os tamanhos no batem, informe apt@packages.debian.org" +msgstr "Que estranho.. Os tamanhos não batem, informe apt@packages.debian.org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr " preciso fazer o download de %sB/%sB de arquivos.\n" +msgstr "É preciso fazer o download de %sB/%sB de arquivos.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" -msgstr " preciso fazer o download de %sB de arquivos.\n" +msgstr "É preciso fazer o download de %sB de arquivos.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" -"Depois de desempacotamento, %sB adicionais de espao em disco sero usados.\n" +"Depois de desempacotar, %sB adicionais de espaço em disco serão usados.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Depois de desempacotar, %sB de espao em disco sero liberados.\n" +msgstr "Depois de desempacotar, %sB de espaço em disco serão liberados.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" -msgstr "No foi possvel determinar o espao livre em %s" +msgstr "Não foi possível determinar o espaço livre em %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." -msgstr "Voc no possui espao suficiente em %s." +msgstr "Você não possui espaço suficiente em %s." -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "Triviais Apenas especificado mas essa no uma operao trivial." +msgstr "Trivial Only especificado mas essa não é uma operação trivial." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" -msgstr "Sim, faa o que eu digo!" +msgstr "Sim, faça o que eu digo!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Voc est prestes a fazer algo potencialmente destruidor.\n" +"Você está prestes a fazer algo potencialmente destruidor.\n" "Para continuar digite a frase '%s'\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." -msgstr "Abortado." +msgstr "Abortar." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " -msgstr "Quer continuar [S/n] ? " +msgstr "Quer continuar [S/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" -msgstr "Falha ao baixar %s %s\n" +msgstr "Falha ao buscar %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Alguns arquivos falharam ao baixar" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" -msgstr "Download completo e em modo de apenas download" +msgstr "Baixar completo e no modo somente baixar (\"download only\")" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Impossvel pegar alguns arquivos, talvez rodar apt-get update ou tentar com " -"--fix-missing?" +"Impossível buscar alguns arquivos, talvez executar apt-get update ou tentar " +"com --fix-missing?" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing e troca de mdia no so suportados atualmente" +msgstr "--fix-missing e troca de mídia não são suportados atualmente" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." -msgstr "Impossvel corrigir pacotes faltosos." +msgstr "Impossível corrigir pacotes faltosos." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." -msgstr "Abortando Instalao." +msgstr "Abortando instalação." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "Nota, selecionando %s ao invs de %s\n" +msgstr "Nota, selecionando %s ao invés de %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" -msgstr "Pulando %s, j est instalado e a atualizao no est configurada.\n" +msgstr "" +"Ignorando %s, já está instalado e a atualização não está configurada.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "O pacote %s no est instalado, ento no ser removido\n" +msgstr "O pacote %s não está instalado, então não será removido\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" -msgstr "O pacote %s um pacote virtual provido por:\n" +msgstr "O pacote %s é um pacote virtual provido por:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." -msgstr "Voc deve selecionar um explicitamente para instalar." +msgstr "Você deve selecionar um explicitamente para instalar." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" msgstr "" -"O pacote %s no est disponvel, mas referenciado por outro pacote.\n" -"Isso pode significar que o pacote est faltando, ficou obsoleto ou\n" -"est disponvel somente a partir de outra fonte\n" +"O pacote %s não está disponível, mas é referenciado por outro pacote.\n" +"Isso pode significar que o pacote está faltando, ficou obsoleto ou\n" +"está disponível somente a partir de outra fonte\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "No entanto, os pacotes a seguir o substituem:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" -msgstr "O pacote %s no tem candidato para instalao" +msgstr "O pacote %s não tem candidato para instalação" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "" -"A reinstalao de %s no possvel, o download do mesmo no pode ser " -"feito.\n" +msgstr "A reinstalação de %s não é possível, não pode ser baixado.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" -msgstr "%s j a verso mais nova.\n" +msgstr "%s já é a versão mais nova.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" -msgstr "Release '%s' para '%s' no foi encontrada" +msgstr "Release '%s' para '%s' não foi encontrada" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" -msgstr "Verso '%s' para '%s' no foi encontrada" +msgstr "Versão '%s' para '%s' não foi encontrada" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" -msgstr "Verso selecionada %s (%s) para %s\n" +msgstr "Versão selecionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" -msgstr "O comando update no leva argumentos" +msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" -msgstr "Impossvel criar lock no diretrio de listas" +msgstr "Impossível criar lock no diretório de listas" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -"Alguns arquivos de ndice falharam no download, eles foram ignorados ou os " -"antigos foram usados em seu lugar." +"Alguns arquivos de índice falharam para baixar, eles foram ignorados ou os " +"antigos foram usados no lugar." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" -msgstr "A informao a seguir pode ajudar a resolver a situao:" +msgstr "A informação a seguir pode ajudar a resolver a situação:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" -msgstr "Erro Interno, o solucionador de problemas quebrou coisas" +msgstr "Erro interno, o solucionador de problemas quebrou coisas" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" -msgstr "Erro Interno, AllUpgrade quebrou as coisas" +msgstr "Erro interno, AllUpgrade quebrou as coisas" #: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597 #, c-format msgid "Couldn't find package %s" -msgstr "Impossvel achar pacote %s" +msgstr "Impossível achar pacote %s" #: cmdline/apt-get.cc:1584 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "Nota, selecionando %s para expresso regular '%s'\n" +msgstr "Nota, selecionando %s para expressão regular '%s'\n" #: cmdline/apt-get.cc:1614 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Voc deve querer rodar `apt-get -f install' para corrigir isso:" +msgstr "Você deve querer executar `apt-get -f install' para corrigir isso:" #: cmdline/apt-get.cc:1617 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Dependncias desencontradas. Tente `apt-get -f install' sem nenhum pacote " -"(ou especifique uma soluo)." +"Dependências desencontradas. Tente `apt-get -f install' sem nenhum pacote " +"(ou especifique uma solução)." #: cmdline/apt-get.cc:1629 msgid "" @@ -1055,9 +1066,9 @@ msgid "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." msgstr "" -"Alguns pacotes no puderam ser instalados. Isso pode significar que\n" -"voc solicitou uma situao impossvel ou se voc est usando a\n" -"distribuio instvel, que alguns pacotes requeridos no foram \n" +"Alguns pacotes não puderam ser instalados. Isso pode significar que\n" +"você solicitou uma situação impossível ou se você está usando a\n" +"distribuição instável, que alguns pacotes requeridos não foram\n" "criados ainda ou foram tirados do Incoming." #: cmdline/apt-get.cc:1637 @@ -1066,8 +1077,8 @@ msgid "" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -"J que voc solicitou uma nica operao bem provvel que o pacote\n" -"esteja simplesmente no instalvel e um relato de erro sobre esse\n" +"Já que você solicitou uma única operação é bem provável que o pacote\n" +"esteja simplesmente não instalável e um relato de erro sobre esse\n" "pacotes deve ser enviado." #: cmdline/apt-get.cc:1645 @@ -1076,19 +1087,19 @@ msgstr "Pacotes quebrados" #: cmdline/apt-get.cc:1676 msgid "The following extra packages will be installed:" -msgstr "Os pacotes extra a seguir sero instalados:" +msgstr "Os pacotes extra a seguir serão instalados:" #: cmdline/apt-get.cc:1765 msgid "Suggested packages:" -msgstr "Pacotes sugeridos :" +msgstr "Pacotes sugeridos:" #: cmdline/apt-get.cc:1766 msgid "Recommended packages:" -msgstr "Pacotes recomendados :" +msgstr "Pacotes recomendados:" #: cmdline/apt-get.cc:1786 msgid "Calculating upgrade... " -msgstr "Calculando Atualizao... " +msgstr "Calculando atualização... " #: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" @@ -1100,31 +1111,31 @@ msgstr "Pronto" #: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869 msgid "Internal error, problem resolver broke stuff" -msgstr "Erro Interno, o solucionador de problemas quebrou coisas" +msgstr "Erro interno, o solucionador de problemas quebrou coisas" #: cmdline/apt-get.cc:1969 msgid "Must specify at least one package to fetch source for" -msgstr "Deve-se especificar pelo menos um pacote para que se baixe o fonte" +msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte" #: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228 #, c-format msgid "Unable to find a source package for %s" -msgstr "Impossvel encontrar um pacote fonte para %s" +msgstr "Impossível encontrar um pacote fonte para %s" #: cmdline/apt-get.cc:2043 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Omitindo arquivo j obtido '%s'\n" +msgstr "Ignorando arquivo já obtido '%s'\n" #: cmdline/apt-get.cc:2067 #, c-format msgid "You don't have enough free space in %s" -msgstr "Voc no possui espao livre suficiente em %s" +msgstr "Você não possui espaço livre suficiente em %s" #: cmdline/apt-get.cc:2072 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "Preciso pegar %sB/%sB de arquivos fonte.\n" +msgstr "Preciso obter %sB/%sB de arquivos fonte.\n" #: cmdline/apt-get.cc:2075 #, c-format @@ -1134,16 +1145,16 @@ msgstr "Precisa obter %sB de arquivos fonte.\n" #: cmdline/apt-get.cc:2081 #, c-format msgid "Fetch source %s\n" -msgstr "Obter Fonte %s\n" +msgstr "Obter fonte %s\n" #: cmdline/apt-get.cc:2112 msgid "Failed to fetch some archives." -msgstr "Falha ao fazer o download de alguns arquivos." +msgstr "Falha ao buscar alguns arquivos." #: cmdline/apt-get.cc:2140 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "Pulando desempacotamento de pacote fonte j desempacotado em %s\n" +msgstr "Ignorando desempacotamento de fonte já desempacotado em %s\n" #: cmdline/apt-get.cc:2152 #, c-format @@ -1153,12 +1164,12 @@ msgstr "Comando de desempacotamento '%s' falhou.\n" #: cmdline/apt-get.cc:2153 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Confira se o pacote dpkg-dev est instalado.\n" +msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n" #: cmdline/apt-get.cc:2170 #, c-format msgid "Build command '%s' failed.\n" -msgstr "Comando de construo '%s' falhou.\n" +msgstr "Comando de construção '%s' falhou.\n" #: cmdline/apt-get.cc:2189 msgid "Child process failed" @@ -1167,18 +1178,18 @@ msgstr "Processo filho falhou" #: cmdline/apt-get.cc:2205 msgid "Must specify at least one package to check builddeps for" msgstr "" -"Deve-se especificar pelo menos um pacote para que se cheque as dependncias " -"de construo" +"Deve-se especificar pelo menos um pacote para que se cheque as dependências " +"de construção" #: cmdline/apt-get.cc:2233 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "Impossvel conseguir informaes de dependncia de construo para %s" +msgstr "Impossível conseguir informações de dependência de construção para %s" #: cmdline/apt-get.cc:2253 #, c-format msgid "%s has no build depends.\n" -msgstr "%s no tem dependncias de construo.\n" +msgstr "%s não tem dependências de construção.\n" #: cmdline/apt-get.cc:2305 #, c-format @@ -1186,8 +1197,8 @@ msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"a dependncia de %s por %s no pde ser satisfeita porque o pacote %s no " -"pde ser encontrado" +"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:2357 #, c-format @@ -1195,33 +1206,33 @@ msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -"a dependncia de %s por %s no pode ser satisfeita porque nenhuma verso " -"disponvel do pacote %s pode satisfazer os requerimentos de verso" +"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:2392 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Falha ao satisfazer a dependncia %s para %s: Pacote instalado %s muito " +"Falha ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito " "novo" #: cmdline/apt-get.cc:2417 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Falha ao satisfazer dependncia %s para %s: %s" +msgstr "Falha ao satisfazer dependência de %s por %s: %s" #: cmdline/apt-get.cc:2431 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "No foi possvel satisfazer as dependncias de compilao para %s." +msgstr "Não foi possível satisfazer as dependências de compilação para %s." #: cmdline/apt-get.cc:2435 msgid "Failed to process build dependencies" -msgstr "Falha ao processar as dependncias de construo" +msgstr "Falha ao processar as dependências de construção" #: cmdline/apt-get.cc:2467 msgid "Supported modules:" -msgstr "Mdulos Suportados:" +msgstr "Módulos suportados:" #: cmdline/apt-get.cc:2508 msgid "" @@ -1264,43 +1275,43 @@ msgid "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" msgstr "" -"Uso: apt-get [opes] comando\n" -" apt-get [opes] install|remove pacote1 [pacote2 ...]\n" -" apt-get [opes] source pacote1 [pacote2 ...]\n" +"Uso: apt-get [opções] comando\n" +" apt-get [opções] install|remove pacote1 [pacote2 ...]\n" +" apt-get [opções] source pacote1 [pacote2 ...]\n" "\n" -"O apt-get uma interface simples de linha de comando para fazer o\n" -"download de pacotes e instal-los. Os comandos usados mais frequentemente\n" -"so update e install\n" +"O apt-get é uma interface simples de linha de comando para fazer o\n" +"download de pacotes e instalá-los. Os comandos usados mais frequentemente\n" +"são update e install.\n" "\n" "Comandos:\n" " update - Adquire novas listas de pacotes\n" -" upgrade - Faz uma atualizao\n" -" install - Instala novos pacotes (um pacote libc6 e no libc6.deb)\n" -" remove - Remove um pacote\n" -" source - Faz o download de arquivos fonte\n" -" build-dep - Configura as dependncias de compilao de pacotes fonte\n" -" dist-upgrade - Atualiza a distribuio, consulte apt-get(8)\n" -" dselect-upgrade - Segue as selees do dselect\n" -" clean - Apaga arquivos baixados para instalao\n" -" autoclean - Apaga arquivos antigos baixados para instalao\n" -" check - Verifica se no h dependncias quebradas\n" +" upgrade - Faz uma atualização\n" +" install - Instala novos pacotes (um pacote é libc6 e não libc6.deb)\n" +" remove - Remove pacotes\n" +" source - Baixa arquivos fonte\n" +" build-dep - Configura as dependências de compilação de pacotes fonte\n" +" dist-upgrade - Atualiza a distribuição, consulte apt-get(8)\n" +" dselect-upgrade - Segue as seleções do dselect\n" +" clean - Apaga arquivos baixados para instalação\n" +" autoclean - Apaga arquivos antigos baixados para instalação\n" +" check - Verifica se não há dependências quebradas\n" "\n" -"Opes:\n" +"Opções:\n" " -h Esse texto de ajuda\n" -" -q Sada logvel, exceto para erros\n" -" -qq Sem sada, exceto para erros\n" -" -d Fazer o download apenas - NO instalar ou desempacotar arquivos\n" -" -s No-agir. Executar simulao de ordenao\n" -" -y Assumir Sim para todas as perguntas, no pedir confirmao\n" +" -q Saída logável, exceto para erros\n" +" -qq Sem saída, exceto para erros\n" +" -d Fazer o download apenas - NÃO instalar ou desempacotar arquivos\n" +" -s Não-agir. Executar simulação de ordenação\n" +" -y Assumir Sim para todas as perguntas e não questionar\n" " -f Tenta continuar se a checagem de integridade falhar\n" -" -m Tenta continuar se os arquivos no podem ser localizados\n" -" -u Mostra uma lista de pacotes atualizados tambm\n" -" -b Constri o pacote fonte depois de baix-lo\n" -" -c=? Ler esse arquivo de configurao\n" -" -o=? Definir uma opo de configurao arbitrria, \n" -" ex -o dir::cache=/tmp\n" -"Veja as pginas de manual apt-get(8), sources.list(5) e apt.conf(5)\n" -"para maiores informaes e opes.\n" +" -m Tenta continuar se os arquivos não podem ser localizados\n" +" -u Mostra uma lista de pacotes atualizados também\n" +" -b Constrói o pacote fonte depois de baixá-lo\n" +" -V Exibe números de versões mais detalhados\n" +" -c=? Ler esse arquivo de configuração\n" +" -o=? Definir uma opção de configuração arbitrária, ex -o dir::cache=/tmp\n" +"Veja as páginas de manual apt-get(8), sources.list(5) e apt.conf(5)\n" +"para maiores informações e opções.\n" " Este APT tem Poderes de Super Vaca.\n" #: cmdline/acqprogress.cc:55 @@ -1336,7 +1347,7 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" -"Troca de mdia: Por favor insira o disco nomeado\n" +"Troca de mídia: por favor insira o disco nomeado\n" " '%s'\n" "no drive '%s' e pressione enter\n" @@ -1357,20 +1368,20 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Uso: apt-sortpkgs [opes] arquivo1 [arquivo2 ...]\n" +"Uso: apt-sortpkgs [opções] arquivo1 [arquivo2 ...]\n" "\n" -"O apt-sortpkgs uma ferramenta simples para ordenar arquivos de pacote.\n" -"A opo -s usada para indicar que tipo de arquivo .\n" +"O apt-sortpkgs é uma ferramenta simples para ordenar arquivos de pacote.\n" +"A opção -s é usada para indicar que tipo de arquivo é.\n" "\n" -"Opes:\n" +"Opções:\n" " -h Esse texto de ajuda\n" -" -s Usar ordenao de arquivo fonte\n" -" -c=? Ler esse arquivo de configurao\n" -" -o=? Define uma opo arbitrria de configurao, ex: -o dir::cache=/tmp\n" +" -s Usar ordenação de arquivo fonte\n" +" -c=? Ler esse arquivo de configuração\n" +" -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" #: dselect/install:32 msgid "Bad default setting!" -msgstr "Configurao padro ruim!" +msgstr "Configuração padrão ruim!" #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 #: dselect/install:104 dselect/update:45 @@ -1382,26 +1393,28 @@ msgstr "Pressione enter para continuar." # at only 80 characters per line, if possible. #: dselect/install:100 msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "Alguns erros ocorreram ao desempacotar. Irei configurar os pacotes" +msgstr "" +"Alguns erros ocorreram ao desempacotar. Eu vou configurar os pacotes que " +"foram" #: dselect/install:101 msgid "packages that were installed. This may result in duplicate errors" -msgstr "que foram instalados. Isto pode resultar em erros duplicados ou erros" +msgstr "" +"instalados. Isto pode resultar em erros duplicados ou erros causados por" #: dselect/install:102 msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "causados por dependncias faltantes. Isto est OK, somente os erros" +msgstr "" +"dependências faltantes. Isto está OK, somente os erros acima desta mensagem" #: dselect/install:103 msgid "" "above this message are important. Please fix them and run [I]nstall again" -msgstr "" -"acima desta mensagem so importantes. Por favor conserte-os e execute [I]" -"nstalar novamente" +msgstr "são importantes. Por favor, conserte-os e execute [I]nstalar novamente" #: dselect/update:30 msgid "Merging available information" -msgstr "Mesclando informao Disponvel" +msgstr "Mesclando informação disponível" #: apt-inst/contrib/extracttar.cc:117 msgid "Failed to create pipes" @@ -1422,35 +1435,35 @@ msgstr "Checksum do arquivo tar falhou, arquivo corrompido" #: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "Tipo de cabealho TAR %u desconhecido, membro %s" +msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s" #: apt-inst/contrib/arfile.cc:73 msgid "Invalid archive signature" -msgstr "Assinatura de arquivo invlida" +msgstr "Assinatura de arquivo inválida" #: apt-inst/contrib/arfile.cc:81 msgid "Error reading archive member header" -msgstr "Erro na leitura de cabealho membro de arquivo" +msgstr "Erro na leitura de cabeçalho membro de arquivo" #: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 msgid "Invalid archive member header" -msgstr "Cabealho membro de arquivo invlido" +msgstr "Cabeçalho membro de arquivo inválido" #: apt-inst/contrib/arfile.cc:131 msgid "Archive is too short" -msgstr "Arquivo muito pequeno" +msgstr "Arquivo é muito pequeno" #: apt-inst/contrib/arfile.cc:135 msgid "Failed to read the archive headers" -msgstr "Falha ao ler os cabeahos do arquivo" +msgstr "Falha ao ler os cabeçalhos do arquivo" #: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" -msgstr "DropNode chamado em nodo ainda linkado" +msgstr "DropNode chamado em nodo ainda ligado (linked)" #: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" -msgstr "Falha ao localizar o elemento hash !" +msgstr "Falha ao localizar o elemento hash!" #: apt-inst/filelist.cc:463 msgid "Failed to allocate diversion" @@ -1458,7 +1471,7 @@ msgstr "Falha ao alocar desvio (diversion)" #: apt-inst/filelist.cc:468 msgid "Internal error in AddDiversion" -msgstr "Erro Interno em AddDiversion" +msgstr "Erro interno em AddDiversion" #: apt-inst/filelist.cc:481 #, c-format @@ -1468,12 +1481,12 @@ msgstr "Tentando sobreescrever um desvio, %s -> %s e %s/%s" #: apt-inst/filelist.cc:510 #, c-format msgid "Double add of diversion %s -> %s" -msgstr "Adio dupla de desvio %s -> %s" +msgstr "Adição dupla de desvio %s -> %s" #: apt-inst/filelist.cc:553 #, c-format msgid "Duplicate conf file %s/%s" -msgstr "Arquivo de confgiurao duplicado %s/%s" +msgstr "Arquivo de configuração duplicado %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 #, c-format @@ -1488,7 +1501,7 @@ msgstr "Falha ao fechar arquivo %s" #: apt-inst/extract.cc:96 apt-inst/extract.cc:167 #, c-format msgid "The path %s is too long" -msgstr "O caminho %s muito longo" +msgstr "O caminho %s é muito longo" #: apt-inst/extract.cc:127 #, c-format @@ -1498,21 +1511,21 @@ msgstr "Desempacotando %s mais de uma vez" #: apt-inst/extract.cc:137 #, c-format msgid "The directory %s is diverted" -msgstr "O diretrio %s desviado (diverted)" +msgstr "O diretório %s é desviado (diverted)" #: apt-inst/extract.cc:147 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Opacote est tentando gravar no alvo de desvio %s/%s" +msgstr "O pacote está tentando gravar no alvo de desvio %s/%s" #: apt-inst/extract.cc:157 apt-inst/extract.cc:300 msgid "The diversion path is too long" -msgstr "O caminho de desvio muito longo" +msgstr "O caminho de desvio é muito longo" #: apt-inst/extract.cc:243 #, c-format msgid "The directory %s is being replaced by a non-directory" -msgstr "O diretrio %s est sendo substitudo por um no-diretrio" +msgstr "O diretório %s está sendo substituído por um não-diretório" #: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" @@ -1520,12 +1533,12 @@ msgstr "Falha ao localizar nodo em seu hash bucket" #: apt-inst/extract.cc:287 msgid "The path is too long" -msgstr "O caminho muito longo" +msgstr "O caminho é muito longo" #: apt-inst/extract.cc:417 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "Sobreescrita de pacote no casa com nenhuma verso para %s" +msgstr "Sobreescrita de pacote não casa com nenhuma versão para %s" #: apt-inst/extract.cc:434 #, c-format @@ -1537,12 +1550,12 @@ msgstr "Arquivo %s/%s sobreescreve arquivo no pacote %s" #: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" -msgstr "Impossvel ler %s" +msgstr "Impossível ler %s" #: apt-inst/extract.cc:494 #, c-format msgid "Unable to stat %s" -msgstr "Impossvel checar %s" +msgstr "Impossível checar %s" #: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 #, c-format @@ -1552,37 +1565,37 @@ msgstr "Falha ao remover %s" #: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 #, c-format msgid "Unable to create %s" -msgstr "Impossvel criar %s" +msgstr "Impossível criar %s" #: apt-inst/deb/dpkgdb.cc:118 #, c-format msgid "Failed to stat %sinfo" -msgstr "Impossvel checar %sinfo." +msgstr "Falha ao checar %sinfo." #: apt-inst/deb/dpkgdb.cc:123 msgid "The info and temp directories need to be on the same filesystem" -msgstr "Os diretrios info e temp precisam estar no mesmo sistema de arquivos" +msgstr "Os diretórios info e temp precisam estar no mesmo sistema de arquivos" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" -msgstr "Lendo Lista de Pacotes" +msgstr "Lendo lista de pacotes" #: apt-inst/deb/dpkgdb.cc:180 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Falha ao mudar para o diretorio administrativo %sinfo" +msgstr "Falha ao mudar para o diretório administrativo %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 "Erro Interno obtendo um Nome de Pacote" +msgstr "Erro interno obtendo um nome de pacote" #: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" -msgstr "Lendo Listagem de Pacotes" +msgstr "Lendo listagem de pacotes" #: apt-inst/deb/dpkgdb.cc:216 #, c-format @@ -1591,9 +1604,9 @@ msgid "" "then make it empty and immediately re-install the same version of the " "package!" msgstr "" -"Falha ao abrir o arquivo de lista '%sinfo/%s'. Caso voc no consiga " +"Falha ao abrir o arquivo de lista '%sinfo/%s'. Caso você não consiga " "restaurar esse arquivo, crie um outro arquivo vazio e reinstale a mesma " -"verso do pacote !" +"versão do pacote!" #: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 #, c-format @@ -1611,17 +1624,17 @@ msgstr "Falha ao abrir o arquivo de desvios %sdiversions" #: apt-inst/deb/dpkgdb.cc:324 msgid "The diversion file is corrupted" -msgstr "O arquivo de desvios est corrompido" +msgstr "O arquivo de desvios está corrompido" #: 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 "Linha invlida no arquivo de desvio: %s" +msgstr "Linha inválida no arquivo de desvio: %s" #: apt-inst/deb/dpkgdb.cc:362 msgid "Internal error adding a diversion" -msgstr "Erro Interno ao adicionar um desvio" +msgstr "Erro interno ao adicionar um desvio" #: apt-inst/deb/dpkgdb.cc:383 msgid "The pkg cache must be initialized first" @@ -1630,89 +1643,90 @@ msgstr "O cache de pacotes deve ser inicializado primeiro" #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Falha ao encontrar um Pacote: Cabealho, posio %lu" +msgstr "Falha ao encontrar um Pacote: cabeçalho, posição %lu" #: apt-inst/deb/dpkgdb.cc:465 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "Seo ConfFile ruim no arquivo de estado. Posio %lu" +msgstr "Seção ConfFile ruim no arquivo de estado. Posição %lu" #: apt-inst/deb/dpkgdb.cc:470 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "Erro interpretando MD5. Posio %lu" +msgstr "Erro interpretando MD5. Posição %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 "Este no um arquivo DEB vlido, membro '%s' faltando" +msgstr "Este não é um arquivo DEB válido, membro '%s' faltando" #: apt-inst/deb/debfile.cc:52 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "" -"Este no um repositrio DEB vlido, o mesmo no possui um membro '%s' ou '%" -"s'" +"Este não é um arquivo DEB válido, o mesmo não possui um membro '%s' ou '%s'" #: apt-inst/deb/debfile.cc:112 #, c-format msgid "Couldn't change to %s" -msgstr "No foi possvel mudar para %s" +msgstr "Não foi possível mudar para %s" #: apt-inst/deb/debfile.cc:138 msgid "Internal error, could not locate member" -msgstr "Erro Interno, no foi possvel localizar membro" +msgstr "Erro interno, não foi possível localizar membro" #: apt-inst/deb/debfile.cc:171 msgid "Failed to locate a valid control file" -msgstr "Falha em localizar um arquivo de controle vlido" +msgstr "Falha em localizar um arquivo de controle válido" #: apt-inst/deb/debfile.cc:256 msgid "Unparsable control file" -msgstr "Arquivo de controle no interpretvel" +msgstr "Arquivo de controle não interpretável" #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "Impossvel ler a base de dados de cdrom %s" +msgstr "Impossível ler a base de dados de cdrom %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 "" -"Por favor use o apt-cdrom para fazer com que este CD seja reconhecido pelo " -"APT. apt-get update no pode ser usado para adicionar novos CDs" +"Por favor use o apt-cdrom para fazer com que este CD-ROM seja reconhecido " +"pelo APT. apt-get update não pode ser usado para adicionar novos CD-ROMs" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" -msgstr "CD errado" +msgstr "CD-ROM errado" #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "Impossvel desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso." +msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso." #: methods/cdrom.cc:169 msgid "Disk not found." -msgstr "Disco no encontrado." +msgstr "Disco não encontrado." #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" -msgstr "Arquivo no encontrado" +msgstr "Arquivo não encontrado" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: 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/gzip.cc:147 msgid "Failed to set modification time" -msgstr "Falha ao definir hora de modificao" +msgstr "Falha ao definir hora de modificação" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" -msgstr "URI invlida, URIs locais no devem iniciar com //" +msgstr "URI inválida, URIs locais não devem iniciar com //" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 @@ -1721,16 +1735,16 @@ msgstr "Logando" #: methods/ftp.cc:168 msgid "Unable to determine the peer name" -msgstr "Impossvel determinar o nome do ponto" +msgstr "Impossível determinar o nome do ponto" #: methods/ftp.cc:173 msgid "Unable to determine the local name" -msgstr "Impossvel determinar o nome local" +msgstr "Impossível determinar o nome local" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" -msgstr "Servidor recusou nossa conexo e respondeu: %s" +msgstr "Servidor recusou a conexão e respondeu: %s" #: methods/ftp.cc:210 #, c-format @@ -1747,13 +1761,13 @@ msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -"Um servidor proxy foi especificado mas no um script de login, Acquire::ftp::" -"ProxyLogin est vazio." +"Um servidor proxy foi especificado mas não um script de login, Acquire::ftp::" +"ProxyLogin está vazio." #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Comando de script de login '%s'falhou, servidor respondeu: %s" +msgstr "Comando de script de login '%s' falhou, servidor respondeu: %s" #: methods/ftp.cc:291 #, c-format @@ -1762,11 +1776,11 @@ msgstr "TYPE falhou, servidor respondeu: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" -msgstr "Tempo limite de conexo atingido" +msgstr "Conexão expirou" #: methods/ftp.cc:335 msgid "Server closed the connection" -msgstr "Servidor fechou a conexo" +msgstr "Servidor fechou a conexão" #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" @@ -1778,48 +1792,48 @@ msgstr "Uma resposta sobrecarregou o buffer" #: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" -msgstr "Corrupo de protocolo" +msgstr "Corrupção de protocolo" #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" -msgstr "Erro de gravao" +msgstr "Erro de gravação" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" -msgstr "No foi possvel criar um socket" +msgstr "Não foi possível criar um socket" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "No foi possvel conectar socket de dados, conexo expirou" +msgstr "Não foi possível conectar socket de dados, conexão expirou" #: methods/ftp.cc:704 msgid "Could not connect passive socket." -msgstr "No foi possvel conectar socket passivo." +msgstr "Não foi possível conectar socket passivo." #: methods/ftp.cc:722 msgid "getaddrinfo was unable to get a listening socket" -msgstr "getaddrinfo no foi capaz de obter um socket de escuta" +msgstr "getaddrinfo não foi capaz de obter um socket de escuta" #: methods/ftp.cc:736 msgid "Could not bind a socket" -msgstr "No foi possvel fazer o bind de um socket" +msgstr "Não foi possível fazer o bind de um socket" #: methods/ftp.cc:740 msgid "Could not listen on the socket" -msgstr "No foi possvel ouvir no socket" +msgstr "Não foi possível ouvir no socket" #: methods/ftp.cc:747 msgid "Could not determine the socket's name" -msgstr "No foi possvel determinar o nome do scoket" +msgstr "Não foi possível determinar o nome do socket" #: methods/ftp.cc:779 msgid "Unable to send PORT command" -msgstr "Impossvel enviar o comando PORT" +msgstr "Impossível enviar o comando PORT" #: methods/ftp.cc:789 #, c-format msgid "Unknown address family %u (AF_*)" -msgstr "Famlia de endereos %u desconhecida (AF_*)" +msgstr "Família de endereços %u desconhecida (AF_*)" #: methods/ftp.cc:798 #, c-format @@ -1828,20 +1842,20 @@ msgstr "EPRT falhou, servidor respondeu: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" -msgstr "Conexo do socket de dados expirou" +msgstr "Conexão do socket de dados expirou" #: methods/ftp.cc:825 msgid "Unable to accept connection" -msgstr "Impossvel aceitar conexo" +msgstr "Impossível aceitar conexão" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do arquivo" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Impossvel obter arquivo, servidor respondeu '%s'" +msgstr "Impossível obter arquivo, servidor respondeu '%s'" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" @@ -1850,7 +1864,7 @@ msgstr "Socket de dados expirou" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Transferncia de dados falhou, servidor respondeu '%s'" +msgstr "Transferência de dados falhou, servidor respondeu '%s'" #. Get the files information #: methods/ftp.cc:997 @@ -1859,7 +1873,7 @@ msgstr "Pesquisa" #: methods/ftp.cc:1109 msgid "Unable to invoke " -msgstr "Impossvel invocar " +msgstr "Impossível invocar " #: methods/connect.cc:64 #, c-format @@ -1874,22 +1888,22 @@ msgstr "[IP: %s %s]" #: methods/connect.cc:80 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" -msgstr "No foi possvel criar um socket para %s (f=%u t=%u p=%u)" +msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)" #: methods/connect.cc:86 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "No posso iniciar a conexo para %s:%s (%s)." +msgstr "Não posso iniciar a conexão para %s:%s (%s)." #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "No foi possvel conectar em %s:%s (%s), conexo expirou" +msgstr "Não foi possível conectar em %s:%s (%s), conexão expirou" #: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." -msgstr "No foi possvel conectar em %s:%s (%s)." +msgstr "Não foi possível conectar em %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going @@ -1901,12 +1915,12 @@ msgstr "Conectando a %s" #: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" -msgstr "No foi possvel resolver '%s'" +msgstr "Não foi possível resolver '%s'" #: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "Falaha temporria resolvendo '%s'" +msgstr "Falha temporária resolvendo '%s'" #: methods/connect.cc:176 #, c-format @@ -1916,33 +1930,35 @@ msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)" #: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" -msgstr "Impossvel conectar em %s %s:" +msgstr "Impossível conectar em %s %s:" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "No foi possvel resolver '%s'" +msgstr "Não foi possível acessar o chaveiro: '%s'" #: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -"E: Lista de argumentos de Acquire::gpgv::Options muito extensa. Sando." +"E: Lista de argumentos de Acquire::gpgv::Options muito extensa. Saindo." #: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -"Erro interno : Assintura boa, mas no foi possvel determinar a impresso " -"digital da chave ?!" +"Erro interno: Assinatura boa, mas não foi possível determinar a impressão " +"digital da chave?!" #: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." -msgstr "Ao menos uma assinatura invlida foi encontrada." +msgstr "Ao menos uma assinatura inválida foi encontrada." #: methods/gpgv.cc:213 -#, fuzzy, c-format +#, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr " ao verificar assinatura (o gnupg est instalado ?)" +msgstr "" +"Não foi possível executar '%s' para verificar a assinatura (o gnupg está " +"instalado?)" #: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" @@ -1950,127 +1966,127 @@ msgstr "Erro desconhecido executando gpgv" #: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" -msgstr "As seguintes assinaturas foram invlidas :\n" +msgstr "As seguintes assinaturas eram inválidas:\n" #: methods/gpgv.cc:256 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -"As assinaturas a seguir no puderam ser verificadas devido a chave pblica " -"no estar disponvel :\n" +"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:57 methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" -msgstr "No foi possvel abrir pipe para %s" +msgstr "Não foi possível abrir pipe para %s" -#: methods/gzip.cc:102 +#: 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:375 msgid "Waiting for headers" -msgstr "Aguardando por cabealhos" +msgstr "Aguardando por cabeçalhos" -#: methods/http.cc:522 +#: methods/http.cc:521 #, c-format msgid "Got a single header line over %u chars" -msgstr "Recebi uma nica linha de cabealho acima de %u caracteres" +msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres" -#: methods/http.cc:530 +#: methods/http.cc:529 msgid "Bad header line" -msgstr "Linha de cabealho ruim" +msgstr "Linha de cabeçalho ruim" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" -msgstr "O servidor http enviou um cabealho de resposta invlido" +msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido" -#: methods/http.cc:585 +#: methods/http.cc:584 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "O servidor http enviou um cabealho Conten-Length invlido" +msgstr "O servidor HTTP enviou um cabeçalho Content-Length inválido" -#: methods/http.cc:600 +#: methods/http.cc:599 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "O servidor http enviou um cabealho Conten-Range invlido" +msgstr "O servidor HTTP enviou um cabeçalho Content-Range inválido" -#: methods/http.cc:602 +#: methods/http.cc:601 msgid "This HTTP server has broken range support" -msgstr "Este servidor http possui suporte a range quebrado" +msgstr "Este servidor HTTP possui suporte a range quebrado" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" -msgstr "Seleo falhou." +msgstr "Seleção falhou" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" -msgstr "Conexo expirou" +msgstr "Conexão expirou" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" -msgstr "Erro gravando para arquivo de sada" +msgstr "Erro gravando para arquivo de saída" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Erro gravando para arquivo" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Erro gravando para o arquivo" -#: methods/http.cc:874 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" -msgstr "Erro lendo do servidor Ponto remoto fechou a conexo" +msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão" -#: methods/http.cc:876 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" -msgstr "Dados de cabealho ruins" +msgstr "Dados de cabeçalho ruins" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" -msgstr "Conexo falhou." +msgstr "Conexão falhou" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Erro interno" #: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" -msgstr "No foi possvel fazer mmap de arquivo vazio" +msgstr "Não foi possível fazer mmap de arquivo vazio" #: apt-pkg/contrib/mmap.cc:87 #, c-format msgid "Couldn't make mmap of %lu bytes" -msgstr "Impossvel fazer mmap de %lu bytes" +msgstr "Impossível fazer mmap de %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" -msgstr "Seleo %s no encontrada" +msgstr "Seleção %s não encontrada" #: apt-pkg/contrib/configuration.cc:436 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Abreviao de tipo desconhecida: '%c'" +msgstr "Abreviação de tipo desconhecida: '%c'" #: apt-pkg/contrib/configuration.cc:494 #, c-format msgid "Opening configuration file %s" -msgstr "Abrindo arquivo de configurao %s" +msgstr "Abrindo arquivo de configuração %s" #: apt-pkg/contrib/configuration.cc:512 #, c-format msgid "Line %d too long (max %d)" -msgstr "Linha %d muito longa (mx. %d)" +msgstr "Linha %d muito longa (máx. %d)" #: apt-pkg/contrib/configuration.cc:608 #, c-format @@ -2080,7 +2096,7 @@ msgstr "Erro de sintaxe %s:%u: Bloco inicia sem nome." #: apt-pkg/contrib/configuration.cc:627 #, c-format msgid "Syntax error %s:%u: Malformed tag" -msgstr "Erro de sintaxe %s:%u: Tag Malformada" +msgstr "Erro de sintaxe %s:%u: Tag mal formada" #: apt-pkg/contrib/configuration.cc:644 #, c-format @@ -2091,7 +2107,7 @@ msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor" #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -"Erro de sintaxe %s:%u: Diretivas podem ser feitas somente no nvel mais alto" +"Erro de sintaxe %s:%u: Diretivas podem ser feitas somente no nível mais alto" #: apt-pkg/contrib/configuration.cc:691 #, c-format @@ -2101,24 +2117,24 @@ msgstr "Erro de sintaxe %s:%u: Muitos includes aninhados" #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" -msgstr "Erro de sintaxe %s:%u: Includo a partir deste ponto" +msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto" #: apt-pkg/contrib/configuration.cc:704 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Erro de sintaxe %s:%u: Diretiva '%s' no suportada" +msgstr "Erro de sintaxe %s:%u: Diretiva '%s' não suportada" #: apt-pkg/contrib/configuration.cc:738 #, c-format 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:154 apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" -msgstr "%c%s... Erro !" +msgstr "%c%s... Erro!" -#: apt-pkg/contrib/progress.cc:156 +#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Pronto" @@ -2126,98 +2142,98 @@ msgstr "%c%s... Pronto" #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "Opo de linha de comando '%c' [de %s] desconnhecida." +msgstr "Opção de linha de comando '%c' [de %s] é desconnhecida." #: 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 "Opo de linha de comando %s no compreendida" +msgstr "Opção de linha de comando %s não é compreendida" #: apt-pkg/contrib/cmndline.cc:127 #, c-format msgid "Command line option %s is not boolean" -msgstr "Opo de linha de comando %s no booleana" +msgstr "Opção de linha de comando %s não é booleana" #: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 #, c-format msgid "Option %s requires an argument." -msgstr "Opo %s requer um argumento." +msgstr "Opção %s requer um argumento." #: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" -"Opo %s: Especificao de item de configurao deve possuir um =<val>." +"Opção %s: Especificação de item de configuração deve possuir um =<val>." #: apt-pkg/contrib/cmndline.cc:237 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "Opo %s requer um argumento inteiro, no '%s'" +msgstr "Opção %s requer um argumento inteiro, não '%s'" #: apt-pkg/contrib/cmndline.cc:268 #, c-format msgid "Option '%s' is too long" -msgstr "Opo '%s' muito longa" +msgstr "Opção '%s' é muito longa" #: apt-pkg/contrib/cmndline.cc:301 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "Sentido %s no compreendido, tente verdadeiro ou falso." +msgstr "Sentido %s não é compreendido, tente verdadeiro ou falso." #: apt-pkg/contrib/cmndline.cc:351 #, c-format msgid "Invalid operation %s" -msgstr "Operao %s invlida" +msgstr "Operação %s inválida" #: apt-pkg/contrib/cdromutl.cc:55 #, c-format msgid "Unable to stat the mount point %s" -msgstr "Impossvel checar o ponto de montagem %s" +msgstr "Impossível checar o ponto de montagem %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 "Impossvel mudar para %s" +msgstr "Impossível mudar para %s" #: apt-pkg/contrib/cdromutl.cc:190 msgid "Failed to stat the cdrom" -msgstr "Impossvel checar o cdrom" +msgstr "Impossível checar o cdrom" #: apt-pkg/contrib/fileutl.cc:82 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "No usando locking para arquivo de trava somente leitura %s" +msgstr "Não usando locking para arquivo de trava somente leitura %s" #: apt-pkg/contrib/fileutl.cc:87 #, c-format msgid "Could not open lock file %s" -msgstr "No foi possvel abri arquivo de trava %s" +msgstr "Não foi possível abrir arquivo de trava %s" #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "No usando locking para arquivo de trava montado via nfs %s" +msgstr "Não usando locking para arquivo de trava montado via nfs %s" #: apt-pkg/contrib/fileutl.cc:109 #, c-format msgid "Could not get lock %s" -msgstr "No foi possvel obter trava %s" +msgstr "Não foi possível obter trava %s" #: apt-pkg/contrib/fileutl.cc:377 #, c-format msgid "Waited for %s but it wasn't there" -msgstr "Esperado %s mas este no estava l" +msgstr "Esperado %s mas este não estava lá" #: apt-pkg/contrib/fileutl.cc:387 #, c-format msgid "Sub-process %s received a segmentation fault." -msgstr "Sub-processo %s recebeu uma falha de segmentao." +msgstr "Sub-processo %s recebeu uma falha de segmentação." #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s returned an error code (%u)" -msgstr "Sub-processo %s retornou um cdigo de erro (%u)" +msgstr "Sub-processo %s retornou um código de erro (%u)" #: apt-pkg/contrib/fileutl.cc:392 #, c-format @@ -2227,7 +2243,7 @@ msgstr "Sub-processo %s finalizou inesperadamente" #: apt-pkg/contrib/fileutl.cc:436 #, c-format msgid "Could not open file %s" -msgstr "No foi possvel abrir arquivo %s" +msgstr "Não foi possível abrir arquivo %s" #: apt-pkg/contrib/fileutl.cc:492 #, c-format @@ -2237,7 +2253,7 @@ msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado" #: apt-pkg/contrib/fileutl.cc:522 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr "gravao, ainda restam %lu para gravar mas no foi possvel" +msgstr "gravação, ainda restam %lu para gravar mas não foi possível" #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" @@ -2251,161 +2267,164 @@ msgstr "Problema removendo o link do arquivo" msgid "Problem syncing the file" msgstr "Problema sincronizando o arquivo" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cache de pacotes vazio" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" -msgstr "O arquivo de cache de pacotes est corrompido" +msgstr "O arquivo de cache de pacotes está corrompido" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" -msgstr "O arquivo de cache de pacotes uma verso incompatvel" +msgstr "O arquivo de cache de pacotes é uma versão incompatível" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "Este APT no suporta o Sistema de Verses '%s'" +msgstr "Este APT não suporta o sistema de versões '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "O cache de pacotes foi gerado para uma arquitetura diferente" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" -msgstr "Pr-Depende" +msgstr "Pré-Depende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Sugere" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recomenda" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Conflita" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Substitui" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Obsoleta" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "requerido" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" -msgstr "padro" +msgstr "padrão" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" -msgstr "Construindo rvore de Dependncias" +msgstr "Construindo árvore de dependências" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" -msgstr "Verses Candidatas" +msgstr "Versões candidatas" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" -msgstr "Gerao de Dependncia" +msgstr "Geração de dependência" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" -msgstr "Mesclando informao Disponvel" +msgstr "Mesclando informação disponível" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Falha ao abrir %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Falha ao gravar arquivo %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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 "Impossvel analizar arquivo de pacote %s (1)" +msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" -msgstr "Impossvel analizar arquivo de pacote %s (2)" +msgstr "Impossível analisar arquivo de pacote %s (2)" #: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "Linha malformada %lu no arquivo de fontes %s (URI)" +msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)" #: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "Linha malformada %lu no arquivo de fontes %s (distribuio)" +msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)" #: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Linha malformada %lu no arquivo de fontes %s (anlise de URI)" +msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)" #: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Linha malformada %lu no arquivo de fontes %s (Distribuio absoluta)" +msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição absoluta)" #: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Linha malformada %lu no arquivo de fontes %s (anlise de distribuio)" +msgstr "" +"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" #: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." -msgstr "Linha %u muito longa na sources.lits %s." +msgstr "Linha %u muito longa na lista de fontes %s." #: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "Linha malformada %u no arquivo de fontes %s (tipo)" +msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)" #: apt-pkg/sourcelist.cc:244 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Tipo '%s' no conhecido na linha %u na lista de fontes %s" +msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s" #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)" +msgstr "Linha mal formada %u na lista de fontes %s (id de fornecedor)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2414,23 +2433,23 @@ msgid "" "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -"Esta execuo de instalao ir requerer remover temporariamente o pacote " -"essencial %s devido a um loop de Conflitos/Pr-Dependncias. Isso geralmente " -" ruim, mas se voc realmente quer fazer isso, ative a opo APT::Force-" +"Esta execução de instalação irá requerer remover temporariamente o pacote " +"essencial %s devido a um loop de Conflitos/Pré-Dependências. Isso geralmente " +"é ruim, mas se você realmente quer fazer isso, ative a opção APT::Force-" "LoopBreak." #: apt-pkg/pkgrecords.cc:37 #, c-format msgid "Index file type '%s' is not supported" -msgstr "Tipo de arquivo de ndice '%s' no suportado" +msgstr "Tipo de arquivo de índice '%s' não é suportado" #: apt-pkg/algorithms.cc:245 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -"O pacote %s precisa ser reinstalado, mas no foi possvel encontrar um " -"repositrio para o mesmo." +"O pacote %s precisa ser reinstalado, mas não foi possível encontrar um " +"arquivo para o mesmo." #: apt-pkg/algorithms.cc:1075 msgid "" @@ -2442,317 +2461,337 @@ msgstr "" #: apt-pkg/algorithms.cc:1077 msgid "Unable to correct problems, you have held broken packages." -msgstr "Impossvel corrigir problemas, voc manteve (hold) pacotes quebrados." +msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados." #: apt-pkg/acquire.cc:62 #, c-format msgid "Lists directory %spartial is missing." -msgstr "Diretrio de listas %spartial est faltando." +msgstr "Diretório de listas %spartial está faltando." #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." -msgstr "Diretrio de repositrio %spartial est faltando." +msgstr "Diretório de repositório %spartial está faltando." #. 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 "Fazendo o download do arquivo %li de %li (%s restantes)" +msgstr "Obtendo o arquivo %li de %li (%s restantes)" #: apt-pkg/acquire.cc:825 -#, fuzzy, c-format +#, c-format msgid "Retrieving file %li of %li" -msgstr "Lendo Listagem de Pacotes" +msgstr "Obtendo arquivo %li de %li" #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." -msgstr "O driver do mtodo %s no pde ser encontrado." +msgstr "O driver do método %s não pôde ser encontrado." #: apt-pkg/acquire-worker.cc:162 #, c-format msgid "Method %s did not start correctly" -msgstr "Mtodo %s no iniciou corretamente" +msgstr "Método %s não iniciou corretamente" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -"Por favor, insira o disco nomeado : '%s' no leitor '%s' e pressione enter." +"Por favor, insira o disco nomeado: '%s' no leitor '%s' e pressione enter." -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "Sistema de empacotamento '%s' no suportado" +msgstr "Sistema de empacotamento '%s' não é suportado" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "" -"No foi possvel determinar um tipo de sistema de empacotamento aplicvel." +"Não foi possível determinar um tipo de sistema de empacotamento aplicável." #: apt-pkg/clean.cc:61 #, c-format msgid "Unable to stat %s." -msgstr "Impossvel checar %s." +msgstr "Impossível checar %s." #: apt-pkg/srcrecords.cc:48 msgid "You must put some 'source' URIs in your sources.list" -msgstr "Voc deve colocar algumas URIs 'source' em seu sources.list" +msgstr "Você deve colocar algumas URIs 'source' em seu sources.list" #: apt-pkg/cachefile.cc:73 msgid "The package lists or status file could not be parsed or opened." msgstr "" -"As listas de pacotes ou o arquivos de status no pde ser analizado ou " -"aberto." +"As listas de pacotes ou os arquivos de status não puderam ser analisados ou " +"abertos." #: apt-pkg/cachefile.cc:77 msgid "You may want to run apt-get update to correct these problems" -msgstr "" -"Voc ter que executar apt-get update para corrigir esses arquivos faltosos" +msgstr "Você terá que executar apt-get update para corrigir esses problemas" #: apt-pkg/policy.cc:269 msgid "Invalid record in the preferences file, no Package header" -msgstr "Registro invlido no arquivo de preferncias, sem cabealho Pacote" +msgstr "Registro inválido no arquivo de preferências, sem cabeçalho Package" #: apt-pkg/policy.cc:291 #, c-format msgid "Did not understand pin type %s" -msgstr "Na foi possvel entender o tipo de pin %s" +msgstr "Não foi possível entender o tipo de pin %s" #: apt-pkg/policy.cc:299 msgid "No priority (or zero) specified for pin" -msgstr "Nenhuma prioridade (ou zero) especificada para pinagem" +msgstr "Nenhuma prioridade (ou zero) especificada para pin" #: apt-pkg/pkgcachegen.cc:76 msgid "Cache has an incompatible versioning system" -msgstr "O Cache possui um sistema de verses incompatvel" +msgstr "O cache possui um sistema de versões incompatível" #: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Um erro ocorreu processando %s (NovoPacote)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Um erro ocorreu processando %s (UsePacote1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Um erro ocorreu processando %s (UsePacote2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Um erro ocorreu processando %s (NovaVerso1)" +msgstr "Um erro ocorreu processando %s (NovaVersão1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Um erro ocorreu processando %s (UsePacote3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Um erro ocorreu processando %s (NovaVerso2)" +msgstr "Um erro ocorreu processando %s (NovaVersão2)" + +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -"Ops, voc excedeu o nmero de nomes de pacotes que este APT capaz de " +"Uau, você excedeu o número de nomes de pacotes que este APT é capaz de " "suportar." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -"Ops, voc excedeu o nmero de verses que este APT capaz de suportar." +"Uau, você excedeu o número de versões que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Uau, você excedeu o número de versões que este APT é capaz de suportar." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -"Ops, voc excedeu o nmero de dependncias que este APT capaz de suportar." +"Uau, você excedeu o número de dependências que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Um erro ocorreu processando %s (EncontrarPacote)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Um erro ocorreu processando %s (ColetarArquivoFornece)" +msgstr "Um erro ocorreu processando %s (ColetarArquivoProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" -msgstr "Pacote %s %s no foi encontrado processando dependncias de arquivo" +msgstr "" +"Pacote %s %s não foi encontrado enquanto processando dependências de arquivo" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" -msgstr "No foi possvel checar a lista de pacotes fonte %s" +msgstr "Não foi possível checar a lista de pacotes fonte %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" -msgstr "Coletando File Provides" +msgstr "Coletando Arquivo Provides" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar cache fonte" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "renomeao falhou, %s (%s -> %s)." +msgstr "renomeação falhou, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" -msgstr "No existem chaves pblicas para os seguintes IDs de chaves :\n" +msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, 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 "" -"No foi possvel localizar um arquivo para o pacote %s. Isto pode significar " -"que voc precisa consertar manualmente este pacote. (devido a arquitetura " -"no especificada)." +"Não foi possível localizar um arquivo para o pacote %s. Isto pode significar " +"que você precisa consertar manualmente este pacote. (devido a arquitetura " +"não especificada)." -#: apt-pkg/acquire-item.cc:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -"No foi possvel localizar arquivo para o pacote %s. Isto pode significar " -"que voc precisa consertar manualmente este pacote." +"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:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -"Os arquivos de ndice de pacotes esto corrompidos. Nenhum campo Filename: " +"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Tamanho incorreto" #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" -msgstr "Bloco Fornecedor %s no contm invlido" +msgstr "Bloco Fornecedor %s não contém impressão digital (\"fingerprint\"" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -"Uando ponto de montagem de CD-ROM %s\n" +"Usando ponto de montagem de CD-ROM %s\n" "Montando CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " -msgstr "Identificando .." +msgstr "Identificando.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" -msgstr "Rtulo Armazenado : %s \n" +msgstr "Rótulo armazenado: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "Usando ponto de montagem de CD-ROm %s\n" +msgstr "Usando ponto de montagem de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Desmontando CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" -msgstr "Aguardando por disco ...\n" +msgstr "Aguardando por disco...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" -msgstr "Montando CD-ROM ...\n" +msgstr "Montando CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" -msgstr "Procurando por arquivos de ndice no disco ..\n" +msgstr "Procurando por arquivos de índice no disco..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" -"Encontrado(s) %i ndice(s) de pacote(s), %i ndice(s) de fonte(s) e %i " +"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:737 msgid "That is not a valid name, try again.\n" -msgstr "Este no um nome vlido, tente novamente.\n" +msgstr "Este não é um nome válido, tente novamente.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -"Esse disco chamado :\n" +"Esse disco é chamado: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." -msgstr "Copiando lista de pacotes ..." +msgstr "Copiando lista de pacotes..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" -msgstr "Gravanco nova lista de fontes\n" +msgstr "Gravando nova lista de fontes\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" -msgstr "Entradas na Lista de Fontes para este Disco so : \n" +msgstr "Entradas na lista de fontes para este disco são:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." -msgstr "Desmontando CD-ROM ..." +msgstr "Desmontando CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Gravados %i registros.\n" -#: 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 "Gravados %i registros com %i arquivos faltando.\n" -#: 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 "Gravados %i registros com %i arquivos que no combinam\n" +msgstr "Gravados %i registros com %i arquivos que não combinam\n" -#: 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 "" -"Gravados %i registros com %i arquivos faltando e %i arquivos que no " +"Gravados %i registros com %i arquivos faltando e %i arquivos que não " "combinam\n" #: apt-pkg/deb/dpkgpm.cc:358 @@ -2783,7 +2822,7 @@ msgstr "%s instalado" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "Preparando para a remoo de %s" +msgstr "Preparando para a remoção de %s" #: apt-pkg/deb/dpkgpm.cc:372 #, c-format @@ -2796,18 +2835,30 @@ msgid "Removed %s" msgstr "%s removido" #: apt-pkg/deb/dpkgpm.cc:378 -#, fuzzy, c-format +#, c-format msgid "Preparing to completely remove %s" -msgstr "Preparando para configurar %s" +msgstr "Preparando 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 "%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 "Conexo encerrada prematuramente" +msgstr "Conexão encerrada prematuramente" + +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +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" + +#~ msgid "Total package names: " +#~ msgstr "Total de nomes de pacotes: " #~ msgid "File date has changed %s" #~ msgstr "Data do arquivo mudou %s" @@ -2816,13 +2867,13 @@ msgstr "Conexo encerrada prematuramente" #~ msgstr "Lendo Listagem de Pacotes" #~ msgid "Could not execute " -#~ msgstr "No foi possvel executar " +#~ msgstr "Não foi possível executar " #~ msgid "Preparing for remove with config %s" -#~ msgstr "Preparando para remoo de %s e sua configurao" +#~ msgstr "Preparando para remoção de %s e sua configuração" #~ msgid "Removed with config %s" -#~ msgstr "%s e sua configurao removidos" +#~ msgstr "%s e sua configuração removidos" #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" @@ -2835,12 +2886,12 @@ msgstr "Conexo encerrada prematuramente" #~ msgstr "" #~ "Alguns pacotes quebrados foram encontrados enquanto se tentava " #~ "processar \n" -#~ "as dependncias de construo.\n" -#~ "Voc pode querer rodar `apt-get -f install' para corrig-los." +#~ "as dependências de construção.\n" +#~ "Você pode querer rodar `apt-get -f install' para corrigí-los." #~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs." #~ msgstr "" -#~ "Desculpe, voc no tem espao livre o suficiente em %s para guardar os ." +#~ "Desculpe, você não tem espaço livre o suficiente em %s para guardar os ." #~ "debs." #, fuzzy @@ -2857,11 +2908,11 @@ msgstr "Conexo encerrada prematuramente" #, fuzzy #~ msgid "You must give at least one file name" -#~ msgstr "Voc deve passar exatamente um padro" +#~ msgstr "Você deve passar exatamente um padrão" #, fuzzy #~ msgid "Regex compilation error" -#~ msgstr "Erro de compilao de regex - %s" +#~ msgstr "Erro de compilação de regex - %s" #, fuzzy #~ msgid "Failed to stat %s%s" @@ -2877,7 +2928,7 @@ msgstr "Conexo encerrada prematuramente" #, fuzzy #~ msgid "Couldn't wait for subprocess" -#~ msgstr "No foi possvel checar a lista de pacotes fonte %s" +#~ msgstr "Não foi possível checar a lista de pacotes fonte %s" #, fuzzy #~ msgid " files " @@ -2889,8 +2940,8 @@ msgstr "Conexo encerrada prematuramente" #, fuzzy #~ msgid "Could not find a record in the DSC '%s'" -#~ msgstr "Impossvel achar pacote %s" +#~ msgstr "Impossível achar pacote %s" #, fuzzy #~ msgid "Failed too stat %s" -#~ msgstr "Impossvel checar %s." +#~ msgstr "Impossível checar %s." @@ -1,160 +1,170 @@ -# translation of apt_ro.po to Romanian +# translation of apt_po_ro.po to Romanian # This file is put in the public domain. -# Sorin Batariuc <sorin@bonbon.net>, 2004, 2005, 2006. # +# Sorin Batariuc <sorin@bonbon.net>, 2004, 2005, 2006. msgid "" msgstr "" "Project-Id-Version: apt_po_ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" -"PO-Revision-Date: 2006-06-25 12:58+0300\n" +"POT-Creation-Date: 2006-08-15 15:55+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" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.10.2\n" +"X-Generator: KBabel 1.11.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pachetul %s versiunea %s are o dependenţă neîndeplinită:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Nu pot localiza pachetul %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Total nume pachete : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Pachete normale: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Pachete virtuale pure: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Pachete virtuale singulare: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Pachete virtuale mixte: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Lipsă: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Total versiuni distincte: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Total versiuni distincte: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Total dependenţe: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Total relaţii versiune/fişier: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Total relaţii versiune/fişier: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Total cartări Furnizează: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Total şiruri înglobate: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Total spaţiu versiuni ale dependenţelor: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Total spaţiu intern: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Total spaţiu contorizat pentru: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Fişierul pachetului %s este desincronizat." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Trebuie să daţi exact un şablon" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Nu s-au găsit pachete" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Fişiere pachet: " -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache este desincronizat, nu pot executa x-ref un fişier pachet" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Pachete alese special:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(negăsit)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Instalat: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(niciunul)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Candidează: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Pachet ales special: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Tabela de versiuni:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pentru %s %s compilat pe %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -303,7 +313,7 @@ msgstr "" " -c=? Citeşte acest fişier de configurare\n" " -o=? Ajustează o opţiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Nu pot scrie în %s" @@ -448,6 +458,8 @@ msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" +"Formatul DB este nevalid. Dacă l-aţi înnoit pe apt de la o versiune mai " +"veche, ştergeţi şi recreaţi baza de date." #: ftparchive/cachedb.cc:81 #, c-format @@ -544,14 +556,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " %s responsabil este %s nu %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s nu are intrare de înlocuire\n" +msgstr " %s nu are nici o intrare sursă de înlocuire\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s nu are intrare de înlocuire\n" +msgstr " %s nu are nici intrare binară de înlocuire\n" #: ftparchive/contents.cc:317 #, c-format @@ -753,120 +765,120 @@ msgstr "%lu de şters şi %lu neînnoite.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu instalate sau şterse incomplet.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Corectez dependenţele..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " eşuare." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Nu pot corecta dependenţele" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Nu pot micşora mulţimea pachetelor de înnoire" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Terminat" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Aţi putea să porniţi 'apt-get -f install' pentru a corecta acestea." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Dependenţe neîndeplinite. Încercaţi să folosiţi -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Avertisment de autentificare înlocuit.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Instalaţi aceste pachete fără verificare [y/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Unele pachete n-au putut fi autentificate" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Sunt unele probleme şi -y a fost folosit fără --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Eroare internă, Ordering nu s-a terminat" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Nu pot încuia directorul de descărcare" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Lista surselor nu poate fi citită." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Ce ciudat.. Dimensiunile nu se potrivesc, scrieţi la apt@packages.debian.org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Este nevoie să descărcaţi %sB/%sB de arhive.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Este nevoie să descărcaţi %sB de arhive.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "După despachetare va fi folosit %sB de spaţiu suplimentar pe disc.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "După despachetare va fi eliberat %sB din spaţiul de pe disc.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "N-am putut determina spaţiul disponibil în %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Nu aveţi suficient spaţiu în %s." -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "A fost specificat 'doar neimportant' dar nu este o operaţiune neimportantă." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Da, fă cum îţi spun!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -877,28 +889,28 @@ msgstr "" "Pentru a continua tastaţi fraza '%s'\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Renunţare." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Vreţi să continuaţi [Y/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eşuare în aducerea %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Eşuare în descărcarea unor fişiere" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Descărcare completă şi în modul doar descărcare" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -906,47 +918,47 @@ msgstr "" "Nu pot aduce unele arhive, poate porniţi 'apt-get update' sau încercaţi cu --" "fix-missing?" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing şi schimbul de mediu nu este deocamdată suportat" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Nu pot corecta pachetele lipsă." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Abandonez instalarea." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Notă, se selectează %s în locul lui %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Sar peste %s, este deja instalat şi înnoirea nu este activată.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pachetul %s nu este instalat, aşa încât nu este şters\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pachetul %s este un pachet virtual furnizat de către:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Instalat]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Ar trebui să alegeţi în mod explicit unul pentru instalare." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -957,49 +969,49 @@ msgstr "" "Aceasta ar putea însemna că pachetul lipseşte, s-a învechit, sau\n" "este disponibil numai din altă sursă\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Oricum următoarele pachete îl înlocuiesc:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Pachetul %s nu are nici un candidat la instalare" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s este deja la cea mai nouă versiune.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' pentru '%s' n-a fost găsită" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiunea '%s' pentru '%s' n-a fost găsită" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versiune selectată %s (%s) pentru %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Comanda de actualizare nu are argumente" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Nu pot încuia directorul cu lista" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1007,27 +1019,27 @@ msgstr "" "Unele fişiere index au eşuat la descărcare, fie au fost ignorate, fie au " "fost folosite în loc unele vechi." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "Următoarele informaţii ar putea să vă ajute la rezolvarea situaţiei:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "" "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" @@ -1575,9 +1587,9 @@ msgstr "" "fişiere" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Citire liste de pachete" @@ -1711,11 +1723,13 @@ msgid "File not found" msgstr "Fişier negăsit" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: 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:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Eşuare la ajustarea timpului" @@ -1843,7 +1857,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemă la indexarea fişierului" @@ -1969,87 +1983,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: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: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:375 msgid "Waiting for headers" msgstr "În aşteptarea antetelor" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Linie de antet necorespunzătoare" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 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:584 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:599 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:601 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:625 msgid "Unknown date format" msgstr "Format de date necunoscut" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Eşuarea selecţiei" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Eroare la scrierea fişierului de rezultat" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Eroare la scrierea în fişier" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Eroare la scrierea în fişierul" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Eroare la citirea de pe server" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Conectare eşuată" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Eroare internă" @@ -2062,7 +2076,7 @@ msgstr "Nu pot mmap un fişier gol" msgid "Couldn't make mmap of %lu bytes" msgstr "Nu pot face mmap la %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Selecţia %s nu s-a găsit" @@ -2123,12 +2137,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Terminat" @@ -2261,108 +2275,110 @@ msgstr "Problemă la dezlegarea fişierului" msgid "Problem syncing the file" msgstr "Problemă în timpul sincronizării fişierului" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cache gol de pachet" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Cache-ul fişierului pachet este deteriorat" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Fişierul cache al pachetului este o versiune incompatibilă" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Acest APT nu suportă versioning system '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Cache-ul pachetului a fost construit pentru o arhitectură diferită" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depinde" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Pre-depinde" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Sugerează" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recomandă" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Este în conflict" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Înlocuieşte" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Învechit" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "cerut" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opţional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Se construieşte arborele de dependenţă" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Versiuni candidat" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Generare dependenţe" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Unirea informaţiilor disponibile" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Eşuare la deschiderea %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Eşuare în scrierea fişierului %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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: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)" @@ -2397,7 +2413,7 @@ msgstr "Linie greşită %lu în lista sursă %s (analiza dist.)" msgid "Opening %s" msgstr "Deschidere %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u prea lungă în lista sursă %s." @@ -2485,18 +2501,18 @@ msgstr "Metoda driver %s nu poate fi găsită." msgid "Method %s did not start correctly" msgstr "Metoda %s nu s-a lansat corect" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Vă rog introduceţi discul numit: '%s' în unitatea '%s' şi apăsaţi Enter." -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistemul de pachete '%s' nu este suportat" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Nu pot determina un tip de sistem de pachete potrivit" @@ -2542,97 +2558,115 @@ msgstr "Cache are un versioning system incompatibil" msgid "Error occurred while processing %s (NewPackage)" msgstr "Eroare apărută în timpul procesării %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Eroare apărută în timpul procesării %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Eroare apărută în timpul procesării %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Eroare apărută în timpul procesării %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Eroare apărută în timpul procesării %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Eroare apărută în timpul procesării %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Mamăăă, aţi depăşit numărul de nume de pachete de care este capabil acest " "APT." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Mamăăă, aţi depăşit numărul de versiuni de care este capabil acest APT." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Mamăăă, aţi depăşit numărul de versiuni de care este capabil acest APT." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Mamăăă, aţi depăşit numărul de dependenţe de care este capabil acest APT." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Eroare apărută în timpul procesării %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Eroare apărută în timpul procesării %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Nu s-a găsit pachetul %s %s în timpul procesării dependenţelor de fişiere" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nu pot determina starea listei surse de pachete %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Colectare furnizori fişier" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "Eroare IO în timpul salvării sursei cache" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "redenumire eşuată, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "Nepotrivire MD5Sum" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" msgstr "" "Nu există nici o cheie publică disponibilă pentru următoarele " "identificatoare de chei:\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2641,7 +2675,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:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2650,7 +2684,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:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2658,7 +2692,7 @@ msgstr "" "Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la " "pachetul %s." -#: apt-pkg/acquire-item.cc:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" @@ -2667,7 +2701,7 @@ msgstr "Nepotrivire dimensiune" msgid "Vendor block %s contains no fingerprint" msgstr "Blocul vânzător %s nu conţine amprentă" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2676,47 +2710,49 @@ msgstr "" "Utilizare puct de montare CD-ROM %s\n" "Montare CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Identificare.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Etichetă memorată: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Utilizare punct de montare CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Demontare CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Aştept discul...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Montez CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Scanez discul de fişierele index..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation 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:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2725,38 +2761,38 @@ msgstr "" "Acest disc este numit: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Copiez listele de pachete.." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Scriere noua listă sursă\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Intrările listei surselor pentru acest disc sunt:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Demontez CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "S-au scris %i înregistrări.\n" -#: 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 "S-au scris %i înregistrări cu %i fişiere lipsă.\n" -#: 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 "S-au scris %i înregistrări cu %i fişiere nepotrivite\n" -#: 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 "" @@ -2812,9 +2848,18 @@ msgstr "Se pregăteşte ştergerea completă a %s" msgid "Completely removed %s" msgstr "Şters complet %s" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Nu pot deschide fişierul %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexiune închisă prematur" -#~ msgid "File date has changed %s" -#~ msgstr "Data fişierului a fost modificată %s" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +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" @@ -1,5 +1,6 @@ -# translation of apt_po_ru.po to Russian +# translation of apt_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. @@ -7,162 +8,171 @@ # Dmitry Astapov <adept@umc.com.ua>, 2004. # Dmitry Astapov <adept@despammed.com>, 2004. # Yuri Kozlov <kozlov.y@gmail.com>, 2004, 2005, 2006. -# msgid "" msgstr "" -"Project-Id-Version: apt_po_ru\n" +"Project-Id-Version: 0.6.46.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" -"PO-Revision-Date: 2006-01-21 14:55+0300\n" +"POT-Creation-Date: 2006-08-15 15:55+0200\n" +"PO-Revision-Date: 2006-10-16 21:53+0400\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.2\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" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, 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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Не могу найти пакет %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Всего имён пакетов : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Нормальных пакетов: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Чисто виртуальных пакетов: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Одиночных виртуальных пакетов: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Смешанных виртуальных пакетов: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Пропущено: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Всего уникальных версий: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Всего уникальных версий: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Всего зависимостей: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Всего отношений Версия/Файл: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Всего отношений Версия/Файл: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Всего отношений Provides: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Всего развёрнутых строк: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Всего информации о зависимостях: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Пустого места в кэше: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Общее пространство посчитанное для: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Список пакетов %s рассинхронизирован." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Вы должны задать ровно один шаблон" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Не найдено ни одного пакета" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Списки пакетов:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Кэш рассинхронизирован, невозможно обнаружить ссылку на список пакетов" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Зафиксированные пакеты:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(не найдено)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Установлен: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(отсутствует)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Кандидат: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Фиксатор пакета: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Таблица версий:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s для %s %s скомпилирован %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -308,7 +318,7 @@ msgstr "" " -c=? Читать указанный конфигурационный файл\n" " -o=? Указать произвольную опцию, к примеру, -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Невозможно записать в %s" @@ -455,6 +465,8 @@ 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 @@ -551,19 +563,19 @@ msgid " %s maintainer is %s not %s\n" msgstr " пакет %s сопровождает %s, а не %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " Нет записи о переназначении (override) для %s\n" +msgstr " Нет записи source override для %s\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " Нет записи о переназначении (override) для %s\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" @@ -762,126 +774,126 @@ msgstr "для удаления отмечено %lu пакетов, и %lu па msgid "%lu not fully installed or removed.\n" msgstr "не установлено до конца или удалено %lu пакетов.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Исправление зависимостей..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " не удалось." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Невозможно скорректировать зависимости" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Невозможно минимизировать набор обновлений" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Готово" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install'." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Аутентификационное предупреждение не принято в внимание.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Установить эти пакеты без проверки [y/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Некоторые пакеты невозможно аутентифицировать" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Существуют проблемы, а опция -y использована без --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Внутренняя ошибка, InstallPackages была вызвана с неработоспособными " "пакетами!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Пакеты необходимо удалить, но удаление запрещено." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Внутренняя ошибка, Ordering не завершилась" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Невозможно заблокировать каталог для загрузки" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Не читается перечень источников." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Странно.. Несовпадение размеров, напишите на apt@packages.debian.org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Необходимо скачать %sB/%sB архивов.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Необходимо скачать %sБ архивов.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "После распаковки объем занятого дискового пространства возрастёт на %sB.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" "После распаковки объем занятого дискового пространства уменьшится на %sB.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не удалось определить количество свободного места в %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Недостаточно свободного места в %s." -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Запрошено выполнение только тривиальных операций, но это не тривиальная " "операция." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Да, делать, как я скажу!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -892,28 +904,28 @@ msgstr "" "Чтобы продолжить, введите фразу: '%s'\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Аварийное завершение." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось загрузить %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Некоторые файлы не удалось загрузить" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Указан режим \"только загрузка\", и загрузка завершена" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -921,48 +933,48 @@ msgstr "" "Невозможно загрузить некоторые архивы, вероятно надо запустить apt-get " "update или попытаться повторить запуск с ключом --fix-missing" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing и смена носителя в данный момент не поддерживаются" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Невозможно исправить ситуацию с пропущенными пакетами." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Аварийное завершение установки." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Заметьте, вместо %2$s выбирается %1$s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Пропускается %s - пакет уже установлен, и опция upgrade не установлена.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Пакет %s не установлен, поэтому не может быть удалён\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Пакет %s - виртуальный, его функции предоставляются пакетами:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Установлен]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Вы должны явно указать, какой именно вы хотите установить." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -973,49 +985,49 @@ msgstr "" "Это может означать, что пакет отсутствует, устарел, или доступен из " "источников, не упомянутых в sources.list\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Однако следующие пакеты могут его заменить:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Для пакета %s не найдены кандидаты на установку" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Переустановка %s невозможна, он не загружается.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "Уже установлена самая новая версия %s.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Релиз '%s' для '%s' не найден" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Версия '%s' для '%s' не найдена" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Выбрана версия %s (%s) для %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Невозможно заблокировать каталог со списками пакетов" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1023,26 +1035,26 @@ msgstr "" "Некоторые индексные файлы не загрузились, они были проигнорированы или " "вместо них были использованы старые версии" -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "Следующая информация возможно поможет Вам:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Внутренняя ошибка, решатель проблем всё поломал" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутренняя ошибка, AllUpgrade все поломал" @@ -1588,9 +1600,9 @@ 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:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Чтение списков пакетов" @@ -1723,11 +1735,13 @@ msgid "File not found" msgstr "Файл не найден" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: 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/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Не удалось установить время модификации" @@ -1859,7 +1873,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблема при хэшировании файла" @@ -1945,9 +1959,9 @@ msgid "Unable to connect to %s %s:" msgstr "Невозможно соединиться с %s %s:" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Не могу найти IP адрес для %s" +msgstr "Нет доступа к связке (keyring) ключей: '%s'" #: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." @@ -1967,9 +1981,9 @@ msgid "At least one invalid signature was encountered." msgstr "Найдена как минимум одна неправильная подпись." #: methods/gpgv.cc:213 -#, fuzzy, c-format +#, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "для проверки подписи (gnupg установлена?)" +msgstr "Не удалось выполнить '%s' для проверки подписи (gnupg установлена?)" #: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" @@ -1986,86 +2000,86 @@ msgid "" msgstr "" "Следующие подписи не могут быть проверены, так как недоступен общий ключ:\n" -#: methods/gzip.cc:57 +#: 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:102 methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "Ошибка чтения из процесса %s" -#: methods/http.cc:376 +#: methods/http.cc:375 msgid "Waiting for headers" msgstr "Ожидание заголовков" -#: methods/http.cc:522 +#: methods/http.cc:521 #, c-format msgid "Got a single header line over %u chars" msgstr "Получен заголовок длиннее %u символов" -#: methods/http.cc:530 +#: methods/http.cc:529 msgid "Bad header line" msgstr "Неверный заголовок" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "Http-сервер послал неверный заголовок" -#: methods/http.cc:585 +#: methods/http.cc:584 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http сервер послал неверный заголовок Content-Length" -#: methods/http.cc:600 +#: methods/http.cc:599 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http-сервер послал неверный заголовок Content-Range" -#: methods/http.cc:602 +#: methods/http.cc:601 msgid "This HTTP server has broken range support" msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:874 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:876 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Неверный заголовок данных" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Внутренняя ошибка" @@ -2078,7 +2092,7 @@ msgstr "Невозможно отобразить в память пустой msgid "Couldn't make mmap of %lu bytes" msgstr "Невозможно отобразить в память %lu байт" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Не найдено: %s" @@ -2140,12 +2154,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Готово" @@ -2283,108 +2297,110 @@ msgstr "Ошибка при удалении файла" msgid "Problem syncing the file" msgstr "Проблема при синхронизации файловых буферов с диском" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Кэш пакетов пуст" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Кэш пакетов повреждён" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Не поддерживаемая версия кэша пакетов" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Данный APT не поддерживает Систему Версий '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Кэш пакетов был собран для другой архитектуры" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Зависит" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "ПредЗависит" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Предлагает" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Рекомендует" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Конфликтует" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Заменяет" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Замещает" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "важный" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "необходимый" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "стандартный" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "необязательный" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "дополнительный" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Построение дерева зависимостей" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Версии-кандидаты" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Генерирование зависимостей" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Объединение информации о доступных пакетах" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Не удалось открыть %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Не удалось записать в файл %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Невозможно прочесть содержимое пакета %s (2)" @@ -2420,7 +2436,7 @@ msgstr "Искажённая строка %lu в списке источнико msgid "Opening %s" msgstr "Открытие %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Строка %u в списке источников %s слишком длинна." @@ -2488,14 +2504,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 осталось)" #: 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 @@ -2507,17 +2523,17 @@ msgstr "Драйвер для метода %s не найден." msgid "Method %s did not start correctly" msgstr "Метод %s запустился не корректно" -#: apt-pkg/acquire-worker.cc:384 +#: 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:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Менеджер пакетов '%s' не поддерживается" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Невозможно определить подходящий тип менеджера пакетов" @@ -2560,90 +2576,107 @@ msgstr "Кэш имеет несовместимую систему версий msgid "Error occurred while processing %s (NewPackage)" msgstr "Произошла ошибка во время обработки %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Произошла ошибка во время обработки %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Произошла ошибка во время обработки %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Произошла ошибка во время обработки %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Произошла ошибка во время обработки %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Произошла ошибка во время обработки %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Произошла ошибка во время обработки %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Произошла ошибка во время обработки %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Произошла ошибка во время обработки %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Превышено допустимое количество имён пакетов." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Превышено допустимое количество версий." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Превышено допустимое количество версий." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Превышено допустимое количество зависимостей." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Произошла ошибка во время обработки %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Произошла ошибка во время обработки %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Во время обработки файла зависимостей не найден пакет %s %s" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Не удалось получить атрибуты списка пакетов с исходными текстами %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Сбор информации о Provides" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "Ошибка ввода/вывода при попытке сохранить кэш исходных текстов" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "переименовать не удалось, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "MD5Sum не совпадает" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" msgstr "Недоступен общий ключ для следующих ключей (ID):\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2652,7 +2685,7 @@ msgstr "" "Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам " "придётся вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2661,13 +2694,13 @@ msgstr "" "Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам " "придётся вручную исправить этот пакет." -#: apt-pkg/acquire-item.cc:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s." -#: apt-pkg/acquire-item.cc:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Не совпадает размер" @@ -2676,7 +2709,7 @@ msgstr "Не совпадает размер" msgid "Vendor block %s contains no fingerprint" msgstr "Блок поставщика %s не содержит отпечатка (fingerprint)" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2685,49 +2718,51 @@ msgstr "" "В качестве точки монтирования CD-ROM используется %s\n" "Монтируется CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Идентификация.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Найдена метка: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Использование %s в качестве точки монтирования CD-ROM\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Размонтирование CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Ожидание операции работы с диском...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Монтирование CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Поиск на диске индексных файлов..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" "Найдено индексов: %i для пакетов, %i для пакетов c исходными текстами\n" "и %i для сигнатур\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Это неправильное имя, попробуйте ещё раз.\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2736,38 +2771,38 @@ msgstr "" "Название диска: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Копирование списков пакетов..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Запись нового списка источников\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Записи в списке источников для этого диска:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Размонтирование CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Сохранено %i записей.\n" -#: 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 "Сохранено %i записей с %i отсутствующими файлами.\n" -#: 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 "Сохранено %i записей с %i несовпадающими файлами\n" -#: 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 "" @@ -2815,30 +2850,25 @@ 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/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Не могу открыть файл %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Соединение закрыто преждевременно" -#~ msgid "File date has changed %s" -#~ 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" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +msgid "There is no public key available for the following key IDs:\n" +msgstr "Недоступен общий ключ для следующих ключей (ID):\n" @@ -7,153 +7,163 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" -"PO-Revision-Date: 2006-05-29 15:33+0200\n" +"POT-Creation-Date: 2006-08-15 15:55+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" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Balík %s verzie %s má nesplnené závislosti:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Balík %s sa nedá nájsť" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Celkom názvov balíkov: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Normálnych balíkov: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Čisto virtuálnych balíkov: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Jednoduchých virtuálnych balíkov: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Zmiešaných virtuálnych balíkov: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Chýbajúcich: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Celkom rôznych verzií: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Celkom rôznych verzií: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Celkom závislostí: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Celkom vzťahov ver/súbor: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Celkom vzťahov ver/súbor: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Celkom poskytnutých mapovaní: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Celkom globovaných reťazcov: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Celkom miesta závislých verzií: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Celkom jalového miesta: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Celkom priradeného miesta: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Súbor balíkov %s je neaktuálny." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Musíte zadať práve jeden vzor" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Neboli nájdené žiadne balíky" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Súbory balíka:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache je neaktuálna, nedá sa odvolať na súbor balíka" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Pripevnené balíky:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(nenájdené)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Nainštalovaná verzia: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(žiadna)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Kandidát: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Pripevnený balík:" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Tabuľka verzií:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pre %s %s skompilovaný na %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -300,7 +310,7 @@ msgstr "" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Do %s sa nedá zapisovať" @@ -437,6 +447,8 @@ msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" +"Formát DB je neplatný. Ak ste aktualizovali staršiu verziu apt, musíte " +"odstrániť a znovu vytvoriť databázu." #: ftparchive/cachedb.cc:81 #, c-format @@ -533,14 +545,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " správcom %s je %s, nie %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s nemá žiadnu položku pre override\n" +msgstr " %s nemá žiadnu source položku pre override\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s nemá žiadnu položku pre override\n" +msgstr " %s nemá žiadnu binary položku pre override\n" #: ftparchive/contents.cc:317 #, c-format @@ -742,120 +754,120 @@ msgstr "%lu na odstránenie a %lu neaktualizovaných.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Opravujú sa závislosti..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " zlyhalo." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Závislosti sa nedajú opraviť" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Sada pre aktualizáciu sa nedá minimalizovať" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Hotovo" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Na opravu môžete spustiť `apt-get -f install'." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Nesplnené závislosti. Skúste použiť -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Upozornenie o vierohodnosti bolo potlačené.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Nainštalovať tieto nekontrolované balíky [y/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Nastali problémy a -y bolo použité bez --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Vnútorná chyba, Triedenie sa neukončilo" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Adresár pre sťahovanie sa nedá zamknúť" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nedá sa načítať zoznam zdrojov." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Nezvyčajná udalosť... Veľkosti nesúhlasia, pošlite e-mail na apt@packages." "debian.org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Je potrebné stiahnuť %sB/%sB archívov.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Je potrebné stiahnuť %sB archívov.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po rozbalení sa na disku použije ďalších %sB.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení sa na disku uvoľní %sB.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "Na %s sa nedá zistiť veľkosť voľného miesta" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, 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:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Zadané 'iba triviálne', ale toto nie je triviálna operácia." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Áno, urob to, čo vravím!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -866,28 +878,28 @@ msgstr "" "Pre pokračovanie opíšte frázu '%s'\n" " ?]" -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Prerušené." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovať [Y/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Niektoré súbory sa nedajú stiahnuť" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Sťahovanie ukončené v režime \"iba stiahnuť\"" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -895,47 +907,47 @@ msgstr "" "Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --" "fix-missing" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výmena média nie sú momentálne podporované" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Chýbajúce balíky sa nedajú opraviť." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Inštalácia sa prerušuje." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Poznámka: %s sa vyberá namiesto %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Preskakuje sa %s, pretože je už nainštalovaný.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Balík %s nie je nainštalovaný, nedá sa teda odstrániť\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Balík %s je virtuálny balík poskytovaný:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr "[Inštalovaný]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Mali by ste explicitne vybrať jeden na inštaláciu." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -945,49 +957,49 @@ msgstr "" "Balík %s nie je dostupný, ale odkazuje naň iný balík. Možno to znamená,\n" "že balík chýba, bol zrušený, alebo je dostupný iba z iného zdroja\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Avšak nahrádzajú ho nasledovné balíky:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Balík %s nemá kandidáta na inštaláciu" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Nie je možná reinštalácia %s, pretože sa nedá stiahnuť.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s je už najnovšej verzie.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nebolo nájdené vydanie '%s' pre '%s'" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nebola nájdená verzia '%s' pre '%s'" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Zvolená verzia %s (%s) pre %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Príkaz update neprijíma žiadne argumenty" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Adresár zoznamov sa nedá zamknúť" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -995,26 +1007,26 @@ msgstr "" "Niektoré indexové súbory sa nepodarilo stiahnuť, boli ignorované, alebo sa " "použili staršie verzie." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Vnútorná chyba, problem resolver pokazil veci" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnútorná chyba, AllUpgrade pokazil veci" @@ -1549,9 +1561,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Adresáre info a temp musia byť na tom istom súborovom systéme" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Načítavajú sa zoznamy balíkov" @@ -1685,11 +1697,13 @@ 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/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: 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/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Zlyhalo nastavenie času zmeny" @@ -1817,7 +1831,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashovaním súboru" @@ -1942,86 +1956,86 @@ msgstr "" "Nasledovné signatúry sa nedajú overiť, pretože nie je dostupný verejný " "kľúč:\n" -#: methods/gzip.cc:57 +#: 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: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:375 msgid "Waiting for headers" msgstr "Čaká sa na hlavičky" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Chybná hlavička" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP server poslal neplatnú hlavičku odpovede" -#: methods/http.cc:585 +#: methods/http.cc:584 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:599 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:601 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má poškodenú podporu rozsahov" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "Neznámy formát dátumu" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Výber zlyhal" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Uplynul čas spojenia" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Chyba pri čítaní zo servera" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Vnútorná chyba" @@ -2034,7 +2048,7 @@ msgstr "Nedá sa vykonať mmap prázdneho súboru" msgid "Couldn't make mmap of %lu bytes" msgstr "Nedá sa urobiť mmap %lu bajtov" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Voľba %s nenájdená" @@ -2095,12 +2109,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Hotovo" @@ -2232,108 +2246,110 @@ msgstr "Problém pri odstraňovaní súboru" msgid "Problem syncing the file" msgstr "Problém pri synchronizovaní súboru" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Vyrovnávacia pamäť balíkov je prázdna" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Súbor vyrovnávacej pamäti balíkov je poškodený" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Súbor vyrovnávacej pamäti balíkov je nezlučiteľnej verzie" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Tento APT nepodporuje systém pre správu verzií '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Súbor vyrovnávacej pamäti balíkov bol vytvorený pre inú architektúru" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Závisí na" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Predzávisí na" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Navrhuje" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Odporúča" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Koliduje s" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Nahrádza" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Zneplatňuje" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "dôležitý" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "požadovaný" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "štandartný" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "voliteľný" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Vytvára sa strom závislostí" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Kandidátske verzie" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Generovanie závislostí" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Zlučujú sa dostupné informácie" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "%s sa nedá otvoriť" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Zápis súboru %s zlyhal" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Súbor %s sa nedá spracovať (2)" @@ -2368,7 +2384,7 @@ msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)" msgid "Opening %s" msgstr "Otvára sa %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý." @@ -2454,17 +2470,17 @@ msgstr "Nedá sa nájsť ovládač spôsobu %s." msgid "Method %s did not start correctly" msgstr "Spôsob %s nebol správne spustený" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Vložte disk nazvaný '%s' do mechaniky '%s' a stlačte Enter." -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Balíčkovací systém '%s' nie je podporovaný" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Nedá sa určiť vhodný typ balíčkovacieho systému" @@ -2507,92 +2523,109 @@ msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií" msgid "Error occurred while processing %s (NewPackage)" msgstr "Chyba pri spracovávaní %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Chyba pri spracovávaní %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Chyba pri spracovávaní %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Chyba pri spracovávaní %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Chyba pri spracovávaní %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Chyba pri spracovávaní %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Chyba pri spracovávaní %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Chyba pri spracovávaní %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Chyba pri spracovávaní %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Fíha, prekročili ste počet názvov balíkov, ktoré toto APT zvládne spracovať." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Fíha, prekročili ste počet verzií, ktoré toto APT zvládne spracovať." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Fíha, prekročili ste počet verzií, ktoré toto APT zvládne spracovať." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Chyba pri spracovávaní %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Chyba pri spracovávaní %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pri spracovaní závislostí nebol nájdený balík %s %s" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "premenovanie zlyhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "Nezhoda MD5 súčtov" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2601,7 +2634,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:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2610,13 +2643,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:854 +#: apt-pkg/acquire-item.cc:1305 #, 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:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Veľkosti sa nezhodujú" @@ -2625,7 +2658,7 @@ msgstr "Veľkosti sa nezhodujú" msgid "Vendor block %s contains no fingerprint" msgstr "Blok výrobcu %s neobsahuje otlačok (fingerprint)" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2634,48 +2667,50 @@ msgstr "" "Použije sa CD-ROM prípojný bod %s\n" "Pripája sa CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Identifikuje sa.." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Uložená menovka: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Použije sa CD-ROM prípojný bod %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM sa odpája\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Čaká sa na disk...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Pripája sa CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Na disku sa hľadajú indexové súbory..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation 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:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2684,38 +2719,38 @@ msgstr "" "Názov tohto disku je: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopírujú sa zoznamy balíkov..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Zapisuje sa nový zoznam zdrojov\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Položky zoznamu zdrojov pre tento disk sú:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "CD-ROM sa odpája..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Zapísaných %i záznamov.\n" -#: 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 "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n" -#: 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 "Zapísaných %i záznamov s %i chybnými súbormi\n" -#: 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 "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n" @@ -2770,9 +2805,19 @@ msgstr "Pripravuje sa úplné odstránenie %s" msgid "Completely removed %s" msgstr "Balík '%s' je úplne odstránený" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Súbor %s sa nedá otvoriť súbor" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Spojenie bolo predčasne ukončené" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +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" + #~ msgid "File date has changed %s" #~ msgstr "Dátum súboru sa zmenil %s" @@ -4,153 +4,163 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" +"POT-Creation-Date: 2006-08-15 15:55+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" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paket %s razliica %s ima nereene odvisnosti:\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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Ne najdem paketa %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Vseh imen paketov:" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Navadni paketi:" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " isti navidezni paketi:" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Posamezni navidezni paketi:" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Meani navidezni paketi:" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Manjka: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Vseh razliic:" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Vseh razliic:" + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Vseh odvisnosti:" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Vseh povezava Raz/Dat:" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Vseh povezava Raz/Dat:" + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Vseh dobljenih preslikav: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Vseh razirjenih nizov: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Celotna velikost z odvisnostmi: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Celotna ohlapna velikost: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Celotna velikost, izraunana za: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Paketna datoteka %s ni usklajena." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Podati morate natanno en vzorec" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Nobena datoteka ni bila najdena" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Paketne datoteke:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Predpomnilnik ni usklajen, x-ref paketne datotek ni mogo" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Pripeti paketi:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(ni najden)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Nameen: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(brez)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Kandidat:" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Zaponka paketa:" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Tabela razliic:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s za %s %s preveden na %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -301,7 +311,7 @@ msgstr "" " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno monost, npr. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Ni mogoe pisati na %s" @@ -745,119 +755,119 @@ msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu ne popolnoma nameenih ali odstranjenih.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Popravljanje odvisnosti ..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " spodletelo." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Ni mogoe popraviti odvisnosti" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Ni mogoe pomanjati zbirke za nadgradnjo" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Opravljeno" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "e elite popraviti napake, poskusite pognati 'apt-get -f install'." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Nereene odvisnosti. Poskusite uporabiti -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "POZORO: Naslednjih paketov ni bilo mogoe avtenticirati!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Namestim te pakete brez prevejanje [y/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Nisem uspel avtenticirati nekaterih paketkov" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Prilo je do teav in -y je bil uporabljen brez --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoeno." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Notranja napaka pri dodajanju odklona" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Ni mogoe zakleniti imenika za prenose" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Seznama virov ni mogoe brati." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Potrebno je dobiti %sB/%sB arhivov.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Potrebno je dobiti %sB arhivov.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po odpakiranju bo sproenega %sB prostora na disku.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Nimate dovolj prostora na %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "V %s je premalo prostora." -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Izbrana je monost Samo preprosto, a to opravilo ni preprosto." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Da, naredi tako kot pravim!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -868,28 +878,28 @@ msgstr "" "Za nadaljevanje vnesite frazo '%s'\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Prekini." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Ali elite nadaljevati [Y/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoe dobiti %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Prenos nekaterih datotek ni uspel" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Prenos dokonan in uporabljen nain samo prenos" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -897,47 +907,47 @@ msgstr "" "Nekaterih arhivov ni mogoe dobiti. Poskusite uporabiti apt-get update ali --" "fix-missing." -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing in izmenjava medija trenutno nista podprta" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Ni mogoe popraviti manjkajoih paketov." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Prekinjanje namestitve." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Opomba: izbran %s namesto %s \n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s preskoen, ker je e nameen in ne potrebuje nadgradnje.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paket %s ni nameen, zato ni odstranjen\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paket %s je navidezen in ga je priskrbel:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Nameeno]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Sami izberite paket, ki ga elite namestiti." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -948,49 +958,49 @@ msgstr "" "To ponavadi pomeni, da paket manjka, je zastaran ali\n" "pa je na voljo samo iz drugega vira.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Kakorkoli, naslednji paketi ga nadomestijo:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Paket %s nima kandidata za namestitev" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ponovna namestitev %s ni mona, ker ni moen prenos.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "Najnoveja razliica %s je e nameena.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Izdaje '%s' za '%s' ni mogoe najti" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Razliice '%s' za '%s' ni mogoe najti" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Izbrana razliica %s (%s) za %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Ukaz update ne potrebuje argumentov" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Imenika seznamov ni mogoe zakleniti" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -998,26 +1008,26 @@ msgstr "" "Nekaterih kazal ni mogoe prenesti, zato so preklicana, ali pa so " "uporabljena stareja." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." @@ -1555,9 +1565,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Podatki in zaasni imeniki morajo biti v istem datotenem sistemu" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Branje seznama paketov" @@ -1691,11 +1701,13 @@ msgid "File not found" msgstr "Datoteke ni mogoe najti" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: methods/gzip.cc:141 methods/gzip.cc:150 msgid "Failed to stat" msgstr "Doloitev ni uspela" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Nastavitev asa spremembe ni uspela" @@ -1823,7 +1835,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Teava pri razprevanju datoteke" @@ -1945,86 +1957,86 @@ msgid "" "available:\n" msgstr "" -#: methods/gzip.cc:57 +#: 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: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:375 msgid "Waiting for headers" msgstr "akanje na glave" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Napana vrstica glave" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "Strenik HTTP je poslal napano glavo odgovora" -#: methods/http.cc:585 +#: methods/http.cc:584 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:599 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:601 msgid "This HTTP server has broken range support" msgstr "Ta strenik HTTP ima pokvarjen obseg podpore" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "as za povezavo se je iztekel" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Napaka pri pisanju v izhodno datoteko" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Napaka pri branju s strenika" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Napani podatki glave" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Notranja napaka" @@ -2037,7 +2049,7 @@ msgstr "mmap prazne datoteke ni mogo" msgid "Couldn't make mmap of %lu bytes" msgstr "Ni mogoe narediti mmap %lu bajtov" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Izbira %s ni mogoe najti" @@ -2098,12 +2110,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Narejeno" @@ -2235,108 +2247,110 @@ msgstr "Teava pri odvezovanju datoteke" msgid "Problem syncing the file" msgstr "Teava pri usklajevanju datoteke" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Prazen predpomnilnik paketov" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Datoteka s predpomnilnikom paketov je pokvarjena" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Razliica datoteke s predpomnilnikom paketov ni ustrezna" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Ta APT ne podpira sistema razliic '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Predpomnilnik paketov je bil zgrajen za drugano arhitekturo" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Odvisen od" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Predodvisnost" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Priporoa" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Priporoa" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "V sporu z" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Zamenja" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Zastarani" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "pomembno" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "obvezno" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standardno" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "izbirno" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "dodatno" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Gradnja drevesa odvisnosti" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Razliice kandidatov" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Ustvarjanje odvisnosti" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Spajanje informacij na voljo" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Ni mogoe odprti %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Napaka pri pisanju datoteke %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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 "Ni mogoe razleniti paketne datoteke %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni mogoe razleniti paketne datoteke %s (2)" @@ -2371,7 +2385,7 @@ msgstr "Napana vrstica %lu v seznamu virov %s (razlenitev distribucije)" msgid "Opening %s" msgstr "Odpiram %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Vrstica %u v seznamu virov %s je predolga." @@ -2458,7 +2472,7 @@ msgstr "Ni mogoe najti gonilnika metod %s." msgid "Method %s did not start correctly" msgstr "Metoda %s se ni zaela pravilno" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2466,12 +2480,12 @@ msgstr "" " '%s'\n" "v enoto '%s' in pritisnite enter\n" -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketni sistem '%s' ni podprt" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Ni mogoe ugotoviti ustrezne vrste paketnega sistema" @@ -2514,90 +2528,106 @@ msgstr "Predpomnilnik ima neustrezen sistem razliic" msgid "Error occurred while processing %s (NewPackage)" msgstr "Prilo je do napake pri obdelavi %s (Nov paket)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Prilo je do napake pri obdelavi %s (Uporabi paket 1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Prilo je do napake pri obdelavi %s (Nova razliica datoteke 1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Prilo je do napake pri obdelavi %s (Uporabi paket 2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Prilo je do napake pri obdelavi %s (Nova razliica datoteke 1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Prilo je do napake pri obdelavi %s (Nova razliica 1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Prilo je do napake pri obdelavi %s (Uporabi paket 3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Prilo je do napake pri obdelavi %s (Nova razliica 2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Prilo je do napake pri obdelavi %s (Nova razliica datoteke 1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Uau, presegli ste tevilo imen paketov, ki jih zmore APT." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Uau, presegli ste tevilo razliic, ki jih zmore APT." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Uau, presegli ste tevilo razliic, ki jih zmore APT." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Uau, presegli ste tevilo odvisnosti, ki jih zmore APT." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Prilo je do napake pri obdelavi %s (Najdi paket)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Prilo je do napake pri obdelavi %s (Zberi dobavitelje datotek)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketa %s %s ni bilo mogoe najti med obdelavo odvisnosti" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ni mogoe doloiti seznama izvornih paketov %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Zbiranje dobaviteljev datotek" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "Napaka IO pri shranjevanju predpomnilnika virov" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "preimenovanje spodletelo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "Neujemanje vsote MD5" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 msgid "There are no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2606,7 +2636,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:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2615,7 +2645,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket." -#: apt-pkg/acquire-item.cc:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2623,7 +2653,7 @@ msgstr "" "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket " "%s." -#: apt-pkg/acquire-item.cc:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Neujemanje velikosti" @@ -2632,7 +2662,7 @@ msgstr "Neujemanje velikosti" msgid "Vendor block %s contains no fingerprint" msgstr "Ponudnikov blok %s ne vsebuje podpisa" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2641,47 +2671,49 @@ msgstr "" "Uporabljam CD-ROM priklopno toko %s\n" "Priklapljam CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Identificiram.." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Shranjena oznaka: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Uporabljam CD-ROM priklopno toko %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Odklapljam CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "akam na medij...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Priklapljam CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Preverjam medij za datoteke s kazalom..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation 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:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2690,38 +2722,38 @@ msgstr "" "Ta medij se imenuje: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopiranje seznama paketov..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Piem nov seznam virov\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Izvorni vnosi za ta medij so:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Odklapljam CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Zapisal %i zapisov.\n" -#: 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 "Zapisal %i zapisov z %i manjkajoimi datotekami.\n" -#: 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 "Zapisal %i zapisov z %i neujemajoimi datotekami.\n" -#: 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 "" @@ -2778,10 +2810,19 @@ msgstr "Odpiranje nastavitvene datoteke %s" msgid "Completely removed %s" msgstr "Odstranitev %s ni uspela" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Ne morem odpreti datoteke %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Povezava se je prezgodaj zaprla" +#: apt-pkg/acquire-item.cc:1097 +msgid "There is no public key available for the following key IDs:\n" +msgstr "" + #~ msgid "File date has changed %s" #~ msgstr "Datum datoteke se je spremenil %s" @@ -7,154 +7,164 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" -"PO-Revision-Date: 2006-05-18 08:35+0100\n" +"POT-Creation-Date: 2006-08-15 15:55+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" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paket %s version %s har ett beroende som inte kan tillfredsstllas:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Kunde inte lokalisera paket %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Totalt antal paketnamn: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Normala paket: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Rent virtuella paket: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Enkelt virtuella paket: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Blandat virtuella paket: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Saknade: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Totalt antal olika versioner: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Totalt antal olika versioner: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Totalt antal beroenden: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Totalt antal version/filrelationer: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Totalt antal version/filrelationer: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Totalt antal tillhandahllningsmarkeringar: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Totalt antal skmnsterstrngar: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Totalt utrymme fr versionsberoenden: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Totalt bortkastat utrymme: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Totalt utrymme som kan redogras fr: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." -msgstr "Paketfilen %s r ur synk." +msgstr "Paketfilen %s r inte synkroniserad." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Du mste ange exakt ett mnster" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" -msgstr "Inga paket funna" +msgstr "Inga paket hittades" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "\"Package\"-filer:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cachen r ur synk, kan inte korsreferera en paketfil" # Prioritet fljt av URI -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Fastnlade paket:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(ej funnen)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Installerad: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(ingen)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Paketnlning: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Versionstabell:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s fr %s %s kompilerad den %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -301,7 +311,7 @@ msgstr "" " -c=? Ls denna instllningsfil.\n" " -o=? Ange valfri instllningsflagga. T.ex -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Kunde inte skriva till %s" @@ -427,7 +437,7 @@ msgstr "Ngra filer saknas i paketfilsgruppen \"%s\"" #: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB var trasig, filen omdpt till %s.old" +msgstr "DB var skadad, filen omdpt till %s.old" #: ftparchive/cachedb.cc:65 #, c-format @@ -439,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 "" +"DB-formatet r ogiltigt. Ta bort och terskapa databasen om du uppgraderar " +"frn en ldre version av apt." #: ftparchive/cachedb.cc:81 #, c-format @@ -449,7 +461,7 @@ msgstr "Kunde inte ppna DB-filen %s: %s" #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" -msgstr "Misslyckades att ta status p %s" +msgstr "Misslyckades med att ta status p %s" #: ftparchive/cachedb.cc:242 msgid "Archive has no control record" @@ -484,17 +496,17 @@ msgstr "F: Felen gller filen " #: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" -msgstr "Misslyckades att sl upp %s" +msgstr "Misslyckades med att sl upp %s" # ??? #: ftparchive/writer.cc:173 msgid "Tree walking failed" -msgstr "Trvandring misslyckades" +msgstr "Trdvandring misslyckades" #: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" -msgstr "Misslyckades att ppna %s" +msgstr "Misslyckades med att ppna %s" #: ftparchive/writer.cc:257 #, c-format @@ -504,17 +516,17 @@ msgstr " Avlnka %s [%s]\n" #: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" -msgstr "Misslyckades att lsa lnk %s" +msgstr "Misslyckades med att lsa lnk %s" #: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" -msgstr "Misslyckades att lnka ut %s" +msgstr "Misslyckades med att lnka ut %s" #: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** Misslyckades att lnka %s till %s" +msgstr "*** Misslyckades med att lnka %s till %s" #: ftparchive/writer.cc:286 #, c-format @@ -538,14 +550,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " ansvarig fr %s r %s ej %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s har ingen post i override-filen\n" +msgstr " %s har ingen kllsidosttningspost\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s har ingen post i override-filen\n" +msgstr " %s har heller ingen binr sidosttningspost\n" #: ftparchive/contents.cc:317 #, c-format @@ -554,7 +566,7 @@ msgstr "Internt fel, kunde inta hitta delen %s" #: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" -msgstr "realloc - Misslyckades att allokera minne" +msgstr "realloc - Misslyckades med att allokera minne" #: ftparchive/override.cc:38 ftparchive/override.cc:146 #, c-format @@ -580,7 +592,7 @@ msgstr "Felaktig override %s rad %lu #3" #: ftparchive/override.cc:131 ftparchive/override.cc:205 #, c-format msgid "Failed to read the override file %s" -msgstr "Misslyckades att lsa override-filen %s" +msgstr "Misslyckades med att lsa sidosttningsfilen %s" #: ftparchive/multicompress.cc:75 #, c-format @@ -595,15 +607,15 @@ msgstr "Komprimerad utdata %s behver en komprimeringsuppsttning" #: ftparchive/multicompress.cc:172 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" -msgstr "Misslyckades att skapa IPC-rr till underprocess" +msgstr "Misslyckades med att skapa IPC-rr till underprocess" #: ftparchive/multicompress.cc:198 msgid "Failed to create FILE*" -msgstr "Misslyckades att skapa FILE*" +msgstr "Misslyckades med att skapa FILE*" #: ftparchive/multicompress.cc:201 msgid "Failed to fork" -msgstr "Misslyckades att grena" +msgstr "Misslyckades med att grena process" #: ftparchive/multicompress.cc:215 msgid "Compress child" @@ -612,15 +624,15 @@ msgstr "Barnprocess fr komprimering" #: ftparchive/multicompress.cc:238 #, c-format msgid "Internal error, failed to create %s" -msgstr "Internt fel, misslyckades att skapa %s" +msgstr "Internt fel, misslyckades med att skapa %s" #: ftparchive/multicompress.cc:289 msgid "Failed to create subprocess IPC" -msgstr "Misslyckades att skapa underprocess-IPC" +msgstr "Misslyckades med att skapa underprocess-IPC" #: ftparchive/multicompress.cc:324 msgid "Failed to exec compressor " -msgstr "Misslyckades att starta packare " +msgstr "Misslyckades med att starta packare " #: ftparchive/multicompress.cc:363 msgid "decompressor" @@ -632,7 +644,7 @@ msgstr "Barnprocessen misslyckades" #: ftparchive/multicompress.cc:458 msgid "Failed to read while computing MD5" -msgstr "Misslyckades att lsa vid berkning av MD5" +msgstr "Misslyckades med att lsa vid berkning av MD5" #: ftparchive/multicompress.cc:475 #, c-format @@ -642,7 +654,7 @@ msgstr "Problem med att lnka ut %s" #: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" -msgstr "Misslyckades att byta namn p %s till %s" +msgstr "Misslyckades med att byta namn p %s till %s" #: cmdline/apt-get.cc:121 msgid "Y" @@ -665,7 +677,7 @@ msgstr "men %s r installerat" #: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" -msgstr "men %s skall installeras" +msgstr "men %s kommer att installeras" #: cmdline/apt-get.cc:337 msgid "but it is not installable" @@ -749,120 +761,121 @@ msgstr "%lu att ta bort och %lu ej uppgraderade.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu ej helt installerade eller borttagna.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." -msgstr "Rttar beroenden...." +msgstr "Rttar till beroenden...." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " misslyckades." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" -msgstr "Kunde inte rtta beroenden" +msgstr "Kunde inte rtta till beroenden" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Kunde inte minimera uppgraderingsuppsttningen" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Frdig" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Du kan mjligen rtta dessa genom att kra \"apt-get -f install\"." +msgstr "" +"Du kan mjligen rtta till dessa genom att kra \"apt-get -f install\"." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Otillfredsstllda beroenden. Frsk med -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VARNING: Fljande paket kunde inte autentiseras!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" -msgstr "Authentiseringsvarning verkrd.\n" +msgstr "Autentiseringsvarning sidosatt.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Installera dessa paket utan verifiering [j/N]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Ngra av paketen kunde inte autentiseras" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Problem har uppsttt och -y anvndes utan --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Internt fel. InstallPackages kallades upp med brutna paket!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Paket mste tas bort men \"Remove\" r inaktiverat." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Internt fel. Sorteringen frdigstlldes inte" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Kunde inte lsa hmtningskatalogen." -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Listan ver kllor kunde inte lsas." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Konstigt.. storlekarna stmde inte, skicka e-post till apt@packages.debian." -"org" +"Konstigt.. storlekarna stmde inte verens, skicka e-post till apt@packages." +"debian.org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Behver hmta %sB/%sB arkiv.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Behver hmta %sB arkiv.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Efter uppackning kommer %sB ytterligare diskutrymme anvndas.\n" +msgstr "Efter uppackning kommer %sB ytterligare diskutrymme att anvndas.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter uppackning kommer %sB frigras p disken.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte lsa av ledigt utrymme i %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, 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:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "\"Trivial Only\" angavs, men detta r inte en trivial handling." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Ja, gr som jag sger!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -874,28 +887,28 @@ msgstr "" " ?] " # Visas d man svarar nej -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Avbryter." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortstta [J/n]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" -msgstr "Misslyckades att hmta %s %s\n" +msgstr "Misslyckades med att hmta %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" -msgstr "Misslyckades att hmta vissa filer" +msgstr "Misslyckades med att hmta vissa filer" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Hmtningen frdig i \"endast-hmta\"-lge" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -903,48 +916,48 @@ msgstr "" "Vissa arkiv kunte inte hmtas. Prva eventuellt \"apt-get update\" eller med " "--fix-missing." -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing och mediabyte stds inte nnu" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." -msgstr "Kunde inte rtta saknade paket." +msgstr "Kunde inte rtta till saknade paket." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Avbryter installationen." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Observera, vljer %s istllet fr %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Hoppar ver %s, det r redan installerat och uppgradering har inte valts.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paketet %s r inte installerat, s tas inte bort\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paketet %s r ett virtuellt paket som tillhandahlls av:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Installerat]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Du br explicit ange ett att installera." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -955,49 +968,49 @@ msgstr "" "Detta betyder vanligen att paketet saknas, har blivit frldrat eller\n" "bara r tillgngligt frn andra kllor\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Dock kan fljande paket erstta det:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Paketet %s har ingen installationskandidat" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ominstallation av %s r inte mjlig, det kan inte hmtas.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s r redan den senaste versionen.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgvan \"%s\" fr \"%s\" hittades inte" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version \"%s\" fr \"%s\" hittades inte" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vald version %s (%s) fr %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Kunde inte lsa listkatalogen" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1005,26 +1018,26 @@ msgstr "" "Vissa indexfiler kunde inte hmtas, de har ignorerats eller s har de gamla " "anvnts istllet." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "Fljande information kan vara till hjlp fr att lsa situationen:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Internt fel, problemlsaren brt snder saker" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade frstrde ngot" @@ -1040,7 +1053,8 @@ msgstr "Observera, vljer %s fr regex \"%s\"\n" #: cmdline/apt-get.cc:1614 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Du kan mjligen rtta detta genom att kra \"apt-get -f install\":" +msgstr "" +"Du kan mjligen rtta till detta genom att kra \"apt-get -f install\":" #: cmdline/apt-get.cc:1617 msgid "" @@ -1140,7 +1154,7 @@ msgstr "Hmtar kllkod %s\n" #: cmdline/apt-get.cc:2112 msgid "Failed to fetch some archives." -msgstr "Misslyckades att hmta vissa arkiv." +msgstr "Misslyckades med att hmta vissa arkiv." #: cmdline/apt-get.cc:2140 #, c-format @@ -1201,13 +1215,13 @@ msgstr "" #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Misslyckades att uppfylla %s-beroendet fr %s: Det installerade paketet %s " -"r fr nytt" +"Misslyckades med att uppfylla %s-beroendet fr %s: Det installerade paketet %" +"s r fr nytt" #: cmdline/apt-get.cc:2417 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Misslyckades att uppfylla %s-beroendet fr %s: %s" +msgstr "Misslyckades med att uppfylla %s-beroendet fr %s: %s" #: cmdline/apt-get.cc:2431 #, c-format @@ -1398,7 +1412,7 @@ msgstr "saknade beroenden. Detta r okej, bara felen ovanfr detta" #: dselect/install:103 msgid "" "above this message are important. Please fix them and run [I]nstall again" -msgstr "meddelande r viktiga. Frsk rtta dem och [I]nstallera igen" +msgstr "meddelande r viktiga. Frsk rtta till dem och [I]nstallera igen" #: dselect/update:30 msgid "Merging available information" @@ -1406,11 +1420,11 @@ msgstr "Lgger in tillgnglighetsinformation" #: apt-inst/contrib/extracttar.cc:117 msgid "Failed to create pipes" -msgstr "Misslyckades att skapa rr" +msgstr "Misslyckades med att skapa rr" #: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " -msgstr "Misslyckades att kra gzip" +msgstr "Misslyckades med att kra gzip" #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" @@ -1431,7 +1445,7 @@ msgstr "Ogiltig arkivsignatur" #: apt-inst/contrib/arfile.cc:81 msgid "Error reading archive member header" -msgstr "Misslyckades att lsa huvud fr arkivdel" +msgstr "Misslyckades med att lsa huvud fr arkivdel" #: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 msgid "Invalid archive member header" @@ -1443,7 +1457,7 @@ msgstr "Arkivet r fr kort" #: apt-inst/contrib/arfile.cc:135 msgid "Failed to read the archive headers" -msgstr "Misslyckades att lsa arkivhuvuden" +msgstr "Misslyckades med att lsa arkivhuvuden" # noden har inte ngon lnk till nsta paket #: apt-inst/filelist.cc:384 @@ -1452,11 +1466,11 @@ msgstr "DropNode anropat p olnkad nod" #: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" -msgstr "Misslyckades att hitta hash-element!" +msgstr "Misslyckades med att hitta hash-element!" #: apt-inst/filelist.cc:463 msgid "Failed to allocate diversion" -msgstr "Misslyckades att allokera omdirigering" +msgstr "Misslyckades med att allokera omdirigering" #: apt-inst/filelist.cc:468 msgid "Internal error in AddDiversion" @@ -1480,12 +1494,12 @@ msgstr "Duplicerad konfigurationsfil %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 "Misslyckades att skriva filen %s" +msgstr "Misslyckades med att skriva filen %s" #: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" -msgstr "Misslyckades att stnga filen %s" +msgstr "Misslyckades med att stnga filen %s" #: apt-inst/extract.cc:96 apt-inst/extract.cc:167 #, c-format @@ -1518,7 +1532,7 @@ msgstr "Katalogen %s erstts av en icke-katalog" #: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" -msgstr "Misslyckades att hitta noden i sin hashkorg" +msgstr "Misslyckades med att hitta noden i sin hashkorg" #: apt-inst/extract.cc:287 msgid "The path is too long" @@ -1550,7 +1564,7 @@ msgstr "Kunde inte ta status p %s" #: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 #, c-format msgid "Failed to remove %s" -msgstr "Misslyckades att ta bort %s" +msgstr "Misslyckades med att ta bort %s" #: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 #, c-format @@ -1567,9 +1581,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Katalogerna info och temp mste ligga p samma filsystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Lser paketlistor" @@ -1595,13 +1609,13 @@ msgid "" "then make it empty and immediately re-install the same version of the " "package!" msgstr "" -"Misslyckades att ppna listfilen \"%sinfo/%s\". Om du inte kan terskapa " +"Misslyckades med att ppna listfilen \"%sinfo/%s\". Om du inte kan terskapa " "filen, skapa en tom och installera omedelbart om samma version av paketet!" #: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Misslyckades att lsa listfilen %sinfo/%s" +msgstr "Misslyckades med att lsa listfilen %sinfo/%s" #: apt-inst/deb/dpkgdb.cc:266 msgid "Internal error getting a node" @@ -1610,7 +1624,7 @@ msgstr "Internt fel nr en nod skulle hmtas" #: apt-inst/deb/dpkgdb.cc:309 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "Misslyckades att ppna omdirigeringsfilen %sdiversions" +msgstr "Misslyckades med att ppna omdirigeringsfilen %sdiversions" #: apt-inst/deb/dpkgdb.cc:324 msgid "The diversion file is corrupted" @@ -1633,12 +1647,12 @@ msgstr "Paketcachen mste ha initierats frst" #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Misslyckades att hitta Package:-huvud, offset %lu" +msgstr "Misslyckades med att hitta Package:-huvud, position %lu" #: apt-inst/deb/dpkgdb.cc:465 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "Felaktiv ConfFile-sektion i statusfilen. Offset %lu" +msgstr "Felaktig ConfFile-sektion i statusfilen. Position %lu" #: apt-inst/deb/dpkgdb.cc:470 #, c-format @@ -1667,7 +1681,7 @@ msgstr "Internt fel, kunde inte hitta del" #: apt-inst/deb/debfile.cc:171 msgid "Failed to locate a valid control file" -msgstr "Misslyckades att hitta en giltig control-fil" +msgstr "Misslyckades med att hitta en giltig control-fil" #: apt-inst/deb/debfile.cc:256 msgid "Unparsable control file" @@ -1704,11 +1718,13 @@ msgid "File not found" msgstr "Filen ej funnen" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: methods/gzip.cc:141 methods/gzip.cc:150 msgid "Failed to stat" msgstr "Kunde inte ta status" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Misslyckades stta modifieringstid" @@ -1768,7 +1784,7 @@ msgstr "Inget svar p frbindelsen inom tidsgrnsen" #: methods/ftp.cc:335 msgid "Server closed the connection" -msgstr "Servern stngde frbindelsen" +msgstr "Servern stngde anslutningen" #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" @@ -1836,7 +1852,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem med att lgga filen till hashtabellen" @@ -1965,87 +1981,87 @@ msgstr "" "Fljande signaturer kunde inte verifieras fr att den publika nyckeln inte " "r tillgnglig:\n" -#: methods/gzip.cc:57 +#: 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: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:375 msgid "Waiting for headers" msgstr "Vntar p huvuden" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Trasig huvudrad" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "Http-servern snde ett ogiltigt svarshuvud" -#: methods/http.cc:585 +#: methods/http.cc:584 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:599 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:601 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:625 msgid "Unknown date format" msgstr "Oknt datumformat" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Tidsgrnsen fr anslutningen nddes" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Fel vid lsning frn server" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Trasigt data i huvud" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Anslutning misslyckades" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Internt fel" @@ -2058,7 +2074,7 @@ msgstr "Kan inte utfra mmap p en tom fil" msgid "Couldn't make mmap of %lu bytes" msgstr "Kunde inte utfra mmap p %lu byte" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Valet %s ej funnet" @@ -2118,12 +2134,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Frdig" @@ -2257,110 +2273,112 @@ msgid "Problem syncing the file" msgstr "Problem med att synka filen" # Felmeddelande -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Paketcachen r tom" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Paketcachefilen r trasig" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Paketcachefilens version r inkompatibel" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Denna APT stder inte versionssystemet \"%s\"" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Paketcachen byggdes fr en annan arkitektur" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Beror" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Beror i frvg" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Freslr" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Rekommenderar" # "Konfliktar"? -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "I konflikt med" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Erstter" # "Frldrar"? -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Gr frldrad" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "viktigt" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "krvt" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "normalt" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "valfri" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Bygger beroendetrd" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Kandiderande versioner" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Beroendegenerering" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Lgger in tillgnglighetsinformation" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" -msgstr "Misslyckades att ppna %s" +msgstr "Misslyckades med att ppna %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" -msgstr "Misslyckades att skriva filen %s" +msgstr "Misslyckades med att skriva filen %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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 "Kunde inte tolka paketfilen %s (1)" -#: apt-pkg/tagfile.cc:186 +#: apt-pkg/tagfile.cc:186 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 @@ msgstr "Rad %lu i kllistan %s har fel format (dist-tolkning)" msgid "Opening %s" msgstr "ppnar %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Rad %u fr lng i kllistan %s." @@ -2483,18 +2501,18 @@ msgstr "Metoddrivrutinen %s kunde inte hittas." msgid "Method %s did not start correctly" msgstr "Metoden %s startade inte korrekt" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck Enter." -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketsystemet \"%s\" stds inte" # -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Kunde inte avgra en lmpligt paketsystemstyp" @@ -2513,7 +2531,7 @@ msgstr "Paketlistan eller statusfilen kunde inte tolkas eller ppnas." #: apt-pkg/cachefile.cc:77 msgid "You may want to run apt-get update to correct these problems" -msgstr "Du kan mjligen rtta problemet genom att kra \"apt-get update\"" +msgstr "Du kan mjligen rtta till problemet genom att kra \"apt-get update\"" # "Package" r en strng i instllningsfilen #: apt-pkg/policy.cc:269 @@ -2539,91 +2557,108 @@ msgstr "Cachen har ett inkompatibelt versionssystem" msgid "Error occurred while processing %s (NewPackage)" msgstr "Fel uppstod vid hantering av %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Fel uppstod vid hantering av %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Fel uppstod vid hantering av %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Fel uppstod vid hantering av %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Fel uppstod vid hantering av %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Fel uppstod vid hantering av %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Fel uppstod vid hantering av %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Fel uppstod vid hantering av %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Fel uppstod vid hantering av %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Grattis, du verskred antalet paketnamn denna APT kan hantera." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Grattis, du verskred antalet versioner denna APT kan hantera." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Grattis, du verskred antalet versioner denna APT kan hantera." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Grattis, du verskred antalet beroenden denna APT kan hantera." # NewPackage etc. r funktionsnamn -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Fel uppstod vid hantering av %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Fel uppstod vid hantering av %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketet %s %s hittades inte nr filberoenden hanterades" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunde inte ta status p kllkodspaketlistan %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Samlar filberoenden" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "In-/utfel vid lagring av kllcache" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumma stmmer inte" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" msgstr "Det finns ingen publik nyckel tillgnglig fr fljande nyckel-id:n:\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2632,7 +2667,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:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2641,13 +2676,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:854 +#: apt-pkg/acquire-item.cc:1305 #, 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:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Storleken stmmer inte" @@ -2656,7 +2691,7 @@ msgstr "Storleken stmmer inte" msgid "Vendor block %s contains no fingerprint" msgstr "Leverantrsblock %s saknar fingeravtryck" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2665,47 +2700,49 @@ msgstr "" "Anvnder cd-rom-monteringspunkt %s\n" "Monterar cd-rom\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Identifierar.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Etikett: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Anvnder cd-rom-monteringspunkt %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Avmonterar cd-rom\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Vntar p skiva...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Monterar cd-rom...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Sker efter indexfiler p disken...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Hittade %i paketindex, %i kllkodsindex och %i signaturer\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2714,38 +2751,38 @@ msgstr "" "Denna skiva heter: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopierar paketlistor..." -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Skriver ny kllista\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Poster i kllistan fr denna skiva:\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Avmonterar cd-rom..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: 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 "Skrev %i poster med %i saknade filer.\n" -#: 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 "Skrev %i poster med %i filer som inte stmmer\n" -#: 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 "Skrev %i poster med %i saknade filer och %i filer som inte stmmer\n" @@ -2800,10 +2837,19 @@ msgstr "Frbereder att ta bort hela %s" msgid "Completely removed %s" msgstr "Tog bort hela %s" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Kunde inte lgga p programfix p filen" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Frbindelsen stngdes i frtid" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +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" + # Felmeddelande fr misslyckad chdir #~ msgid "File date has changed %s" #~ msgstr "Fildatumet har ndrats %s" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" +"POT-Creation-Date: 2006-08-15 15:55+0200\n" "PO-Revision-Date: 2006-03-16 15:53+0800\n" "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n" "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n" @@ -19,145 +19,155 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paketeng %s bersyon %s ay may kulang na dep:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "Kabuuan ng mga Pakete : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " Normal na Pakete: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Purong Birtwual na Pakete: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Nag-iisang Birtwal na Pakete: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " Halong Birtwal na Pakete: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " Kulang/Nawawala: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "Kabuuan ng Natatanging mga Bersyon: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Kabuuan ng Natatanging mga Bersyon: " + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "Kabuuan ng mga Dependensiya: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "Kabuuan ng ugnayang Ber/Talaksan: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Kabuuan ng ugnayang Ber/Talaksan: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "Kabuuan ng Mapping ng Provides: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Kabuuan ng Globbed String: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "Kabuuan ng gamit na puwang ng Dependensiyang Bersyon: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Kabuuan ng Hindi Nagamit na puwang: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "Kabuuan ng puwang na napag-tuosan: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Wala sa sync ang talaksan ng paketeng %s." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Kailangan niyong magbigay ng isa lamang na pattern" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Walang nahanap na mga pakete" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Talaksang Pakete:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Wala sa sync ang cache, hindi ma-x-ref ang talaksang pakete" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Mga naka-Pin na Pakete:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(hindi nahanap)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Nakaluklok: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(wala)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Kandidato: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Naka-Pin na Pakete: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Talaang Bersyon:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para sa %s %s kinompile noong %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -307,7 +317,7 @@ msgstr "" " -c=? Basahin ang talaksang pagkaayos na ito\n" " -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Hindi makapagsulat sa %s" @@ -754,125 +764,125 @@ msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Inaayos ang mga dependensiya..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " ay bigo." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Hindi maayos ang mga dependensiya" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Hindi mai-minimize ang upgrade set" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Tapos" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Maaari ninyong patakbuhin ang `apt-get -f install' upang ayusin ito." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "" "Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Iluklok ang mga paketeng ito na walang beripikasyon [o/H]? " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "May mga problema at -y ay ginamit na walang --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "" "May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Hindi maaldaba ang directory ng download" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Nakapagtataka.. Hindi magkatugma ang laki, mag-email sa apt@packages.debian." "org" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibo.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Matapos magbuklat ay %sB na karagdagang puwang sa disk ang magagamit.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "Hindi matantsa ang libreng puwang sa %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Kulang kayo ng libreng puwang sa %s." -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Oo, gawin ang sinasabi ko!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -883,28 +893,28 @@ msgstr "" "Upang magpatuloy, ibigay ang pariralang '%s'\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Abort." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "May mga talaksang hindi nakuha" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -912,48 +922,48 @@ msgstr "" "Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o " "subukang may --fix-missing?" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Hindi maayos ang mga kulang na pakete." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Ina-abort ang pag-instol." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Paunawa, pinili ang %s imbes na %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Ang paketeng %s ay paketeng birtwal na bigay ng:\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Nakaluklok]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Dapat kayong mamili ng isa na iluluklok." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -964,49 +974,49 @@ msgstr "" "Maaaring nawawala ang pakete, ito'y laos na, o ito'y makukuha lamang\n" "sa ibang pinagmulan.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Gayunpaman, ang sumusunod na mga pakete ay humahalili sa kanya:" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ay pinakabagong bersyon na.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para sa '%s' ay hindi nahanap" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Ang napiling bersyon %s (%s) para sa %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Hindi maaldaba ang directory ng talaan" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1014,27 +1024,27 @@ msgstr "" "May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang " "mga luma na lamang." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "" "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" @@ -1573,9 +1583,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Ang info at temp directory ay kailangang nasa parehong filesystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Binabasa ang Listahan ng mga Pakete" @@ -1710,11 +1720,13 @@ 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/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: 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/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Bigo ang pagtakda ng oras ng pagbago" @@ -1842,7 +1854,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng talaksan" @@ -1969,86 +1981,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: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: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:375 msgid "Waiting for headers" msgstr "Naghihintay ng panimula" -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Maling linyang panimula" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 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:584 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:599 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:601 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:625 msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Bigo ang pagpili" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "Error sa pagsulat ng talaksang output" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:874 +#: methods/http.cc:873 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:875 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Maling datos sa panimula" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Bigo ang koneksyon" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Internal na error" @@ -2061,7 +2073,7 @@ msgstr "Hindi mai-mmap ang talaksang walang laman" msgid "Couldn't make mmap of %lu bytes" msgstr "Hindi makagawa ng mmap ng %lu na byte" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Piniling %s ay hindi nahanap" @@ -2122,12 +2134,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Tapos" @@ -2264,108 +2276,110 @@ msgstr "Problema sa pag-unlink ng talaksan" msgid "Problem syncing the file" msgstr "Problema sa pag-sync ng talaksan" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Walang laman ang cache ng pakete" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Sira ang talaksan ng cache ng pakete" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Ang talaksan ng cache ng pakete ay hindi magamit na bersyon" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Ang APT na ito ay hindi nagsusuporta ng versioning system '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Ang cache ng pakete ay binuo para sa ibang arkitektura" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Dependensiya" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "PreDepends" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Mungkahi" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Rekomendado" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Tunggali" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Pumapalit" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Linalaos" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "kailangan" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "optional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Ginagawa ang puno ng mga dependensiya" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Bersyong Kandidato" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Pagbuo ng Dependensiya" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Pinagsasama ang magagamit na impormasyon" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Bigo ang pagbukas ng %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Bigo sa pagsulat ng talaksang %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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: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)" @@ -2400,7 +2414,7 @@ msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" msgid "Opening %s" msgstr "Binubuksan %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s." @@ -2490,18 +2504,18 @@ msgstr "Ang driver ng paraang %s ay hindi mahanap." msgid "Method %s did not start correctly" msgstr "Hindi umandar ng tama ang paraang %s" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter." -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Hindi suportado ang sistema ng paketeng '%s'" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete " @@ -2547,92 +2561,109 @@ msgstr "Hindi akma ang versioning system ng cache" msgid "Error occurred while processing %s (NewPackage)" msgstr "May naganap na error habang prinoseso ang %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "May naganap na error habang prinoseso ang %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "May naganap na error habang prinoseso ang %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "May naganap na error habang prinoseso ang %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "May naganap na error habang prinoseso ang %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "May naganap na error habang prinoseso ang %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Wow, nalagpasan niyo ang bilang ng pangalan ng pakete na kaya ng APT na ito." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wow, nalagpasan niyo ang bilang ng dependensiya na kaya ng APT na ito." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "May naganap na error habang prinoseso ang %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "May naganap na Error habang prinoseso ang %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Kinukuha ang Talaksang Provides" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "IO Error sa pag-imbak ng source cache" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format 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:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy 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:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2641,7 +2672,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:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2650,7 +2681,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:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2658,7 +2689,7 @@ msgstr "" "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/acquire-item.cc:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Di tugmang laki" @@ -2667,7 +2698,7 @@ msgstr "Di tugmang laki" msgid "Vendor block %s contains no fingerprint" msgstr "Block ng nagbebenta %s ay walang fingerprint" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2676,49 +2707,51 @@ msgstr "" "Ginagamit ang %s bilang mount point ng CD-ROM\n" "Sinasalang ang CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Kinikilala..." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Naka-imbak na Label: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Ginagamit ang %s bilang mount point ng CD-ROM\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Ina-unmount ang CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Hinihintay ang disc...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Sinasalang ang CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Sinisiyasat ang Disc para sa talaksang index...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" 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:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2727,38 +2760,38 @@ msgstr "" "Ang Disc na ito ay nagngangalang: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kinokopya ang Listahan ng mga Pakete" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Sinusulat ang bagong listahan ng pagkukunan\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 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 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Ina-unmount ang CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Nagsulat ng %i na record.\n" -#: 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 "Nagsulat ng %i na record na may %i na talaksang kulang.\n" -#: 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 "Nagsulat ng %i na record na may %i na talaksang mismatch\n" -#: 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 "" @@ -2815,10 +2848,20 @@ msgstr "Hinahanda ang %s upang isaayos" msgid "Completely removed %s" msgstr "Bigo sa pagtanggal ng %s" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Hindi mabuksan ang talaksang %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Nagsara ng maaga ang koneksyon" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +msgid "There is no public key available for the following key IDs:\n" +msgstr "Walang public key na magagamit para sa sumusunod na key ID:\n" + #~ msgid "File date has changed %s" #~ msgstr "Nagbago ang petsa ng talaksang %s" @@ -6,158 +6,168 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" -"PO-Revision-Date: 2006-05-19 22:19+0930\n" +"POT-Creation-Date: 2006-08-15 15:55+0200\n" +"PO-Revision-Date: 2006-09-21 17:16+0930\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" -"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\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.5.5b43u\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: LocFactoryEditor 1.6fc1\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Gói %s phiên bản %s phụ thuộc vào phần mềm chưa có :\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "Không thể định vị gói %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " -msgstr "Tổng tên gói: " +msgstr "Tổng số tên gói: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " -msgstr " Gói bình thường: " +msgstr " Gói chuẩn: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " Gói ảo nguyên chất: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " Gói ảo đơn: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " -msgstr " Gói ảo đã pha trộn: " +msgstr " Gói ảo hỗn hợp:" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " -msgstr " Thiếu: " +msgstr " Thiếu : " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " -msgstr "Tổng phiên bản riêng: " +msgstr "Tổng số phiên bản riêng: " + +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Tổng số phiên bản riêng: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " -msgstr "Tổng cách phụ thuộc: " +msgstr "Tổng số phụ thuộc: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " -msgstr "Tổng cách liên quan phiên bản và tập tin: " +msgstr "Tổng số liên quan phiên bản và tập tin: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Tổng số liên quan phiên bản và tập tin: " + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " -msgstr "Tổng cách ảnh xạ Miễn là: " +msgstr "Tổng số ảnh xạ Miễn là: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " -msgstr "Tổng chuỗi mở rộng mẫu tìm kiếm: " +msgstr "Tổng số chuỗi mở rộng mẫu tìm kiếm: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " -msgstr "Tổng chỗ cho cách phụ thuộc vào phiên bản: " +msgstr "Tổng chỗ phiên bản phụ thuộc:" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " -msgstr "Tổng chỗ chưa dùng: " +msgstr "Tổng chỗ nghỉ:" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " -msgstr "Tổng chỗ sẽ dùng: " +msgstr "Tổng chỗ đã tính: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "Tập tin gói %s không đồng bộ được." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "Bạn phải đưa ra đúng một mẫu" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "Không tìm thấy gói" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "Tập tin gói:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Bộ nhớ tạm không đồng bộ được nên không thể tham chiếu chéo tập tin gói" # Variable: do not translate/ biến: đừng dịch -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "Các gói đã ghim:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(không tìm thấy)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " Đã cài đặt: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(không có)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Ứng cử: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " Ghim gói: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " Bảng phiên bản:" # Variable: do not translate/ biến: đừng dịch -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s cho %s %s được biên dịch vào %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -317,7 +327,7 @@ msgstr "" " -c=? \t\tĐọc tập tin cấu hình này\n" " -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "Không thể ghi vào %s" @@ -470,6 +480,8 @@ msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" +"Dạng thức co sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản " +"apt cũ, hãy gỡ bỏ rồi tạo lại co sở dữ liệu này." #: ftparchive/cachedb.cc:81 #, c-format @@ -566,14 +578,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " người bảo quản %s là %s không phải %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s không có mục ghi đè\n" +msgstr " %s không có mục ghi đè nguồn\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s không có mục ghi đè\n" +msgstr " %s cũng không có mục ghi đè nhị phân\n" #: ftparchive/contents.cc:317 #, c-format @@ -775,122 +787,122 @@ msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Đang sửa cách phụ thuộc..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " đã thất bại." -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Không thể sửa cách phụ thuộc" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Không thể cực tiểu hóa bộ nâng cấp" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Đã xong" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Có lẽ bạn hãy chay lệnh « apt-get -f install » để sửa hết." -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "" "Còn có cách phụ thuộc vào phần mềm chưa có. Như thế thì bạn hãy cố dùng tùy " "chọn « -f »." -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "CẢNH BÁO : không thể xác thực những gói theo đây." -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Cảnh báo xác thực bị đè.\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Cài đặt những gói này mà không kiểm chứng không? [y/N] [c/K] " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Một số gói không thể được xác thực" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Gập lỗi và đã dùng tùy chọn « -y » mà không có « --force-yes »" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Lỗi nội bộ: InstallPackages (cài đặt gói) được gọi với gói bị hỏng." -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ (Remove) đã bị tắt." -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "Không thể khóa thư mục tải về" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Không thể đọc danh sách nguồn." -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Lạ... Hai kích cỡ không khớp được. Hãy gởi thư cho <apt@packages.debian.org>" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Cần phải lấy %sB/%sB kho.\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Cần phải lấy %sB kho.\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Sau khi đã giải nén, sẻ chiếm %sB sức chứa đĩa thêm.\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Sau khi đã giải nén, sẽ giải phóng %sB sức chữa đĩa thêm.\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "Không thể quyết định chỗ rảnh trong %s" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Bạn chưa có đủ sức chức còn rảnh trong %s." -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Xác đinh « Chỉ không đáng kể » (Trivial Only) nhưng mà thao tác này đáng kể." -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Có, làm đi." -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -901,28 +913,28 @@ msgstr "" "Để tiếp tục thì hãy gõ cụm từ « %s »\n" "?]" -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "Hủy bỏ." -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Việc gói %s bị lỗi %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Một số tập tin không tải về được" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "Mới tải về xong và trong chế độ chỉ tải về" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -930,49 +942,49 @@ msgstr "" "Không thể lấy một số kho, có lẽ hãy chạy lệnh « apt-get update » (apt lấy " "cập nhật) hay cố với « --fix-missing » (sửa các điều còn thiếu) không?" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "Chưa hô trợ tùy chọn « --fix-missing » (sửa khi thiếu điều) và trao đổi " "phương tiện." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Không thể sửa những gói còn thiếu." -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Đang hủy bỏ cài đặt." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Ghi chú : đang chọn %s thay vì %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chưa lập tùy chọn Nâng cấp.\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Gói %s là gói ảo được cung cấp do :\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Đã cài đặt]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Bạn nên chọn một cách dứt khoát gói cần cài." -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -983,49 +995,49 @@ msgstr "" "đã tham chiếu đến nó. Có lẽ có nghĩa là gói còn thiếu,\n" "đã trở thành cũ, hay chỉ sẵn sàng từ nguồn khác.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Tuy nhiên, những gói theo đây thay thế nó :" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Gói %s không có ứng cử cài đặt" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Không thể cài đặt lại %s vì không thể tải về nó.\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s là phiên bản mơi nhất.\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Không tìm thấy bản phát hành « %s » cho « %s »" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Không tìm thấy phiên bản « %s » cho « %s »" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Đã chọn phiên bản %s (%s) cho %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Lệnh cập nhật không chấp nhật đối số" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Không thể khóa thư mục danh sách" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1033,26 +1045,26 @@ msgstr "" "Một số tập tin chỉ mục không tải về được, đã bỏ qua chúng, hoặc điều cũ được " "dùng thay thế." -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì" @@ -1599,9 +1611,9 @@ msgstr "" "thống tập tin" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "Đang đọc các danh sách gói..." @@ -1736,11 +1748,13 @@ 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:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: 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:139 +#: methods/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "Việc lập giờ sửa đổi bị lỗi" @@ -1868,7 +1882,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Gặp khó khăn băm tập tin" @@ -1991,90 +2005,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: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: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:375 msgid "Waiting for headers" msgstr "Đang đợi những phần đầu..." -#: methods/http.cc:522 +#: methods/http.cc:521 #, 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:529 msgid "Bad header line" msgstr "Dòng đầu sai" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 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:584 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:599 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:601 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:625 msgid "Unknown date format" msgstr "Không biết dạng ngày" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Việc chọn bị lỗi" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "Kết nối đã quá giờ" -#: methods/http.cc:801 +#: methods/http.cc:800 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:831 msgid "Error writing to file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:860 +#: methods/http.cc:859 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:873 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:875 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:1106 msgid "Bad header data" msgstr "Dữ liệu dòng đầu sai" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Kết nối bị ngắt" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Gặp lỗi nội bộ" @@ -2087,7 +2101,7 @@ msgstr "Không thể mmap (ảnh xạ bộ nhớ) tâp tin rỗng" msgid "Couldn't make mmap of %lu bytes" msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "Không tìm thấy vùng chọn %s" @@ -2147,12 +2161,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Xong" @@ -2284,108 +2298,110 @@ msgstr "Gặp lỗi khi bỏ liên kết tập tin đó" msgid "Problem syncing the file" msgstr "Gặp lỗi khi đồng bộ hóa tập tin đó" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Bộ nhớ tạm gói rỗng" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Tập tin bộ nhớ tạm gói bị hỏng" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Tập tin bộ nhớ tạm gói là một phiên bản không tương thích" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên bản « %s »" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Bộ nhớ tạm gói được xây dụng cho kiến trức khác" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Phụ thuộc" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Phụ thuộc trước" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Đệ nghị" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Khuyên" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Xung đột" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Thay thế" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Làm cũ" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "quan trọng" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "cần" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "chuẩn" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "tùy chọn" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "thêm" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "Đang xây dụng cây cách phụ thuộc..." -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "Phiên bản ứng cử" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "Tạo ra cách phụ thuộc" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "Đang hợp nhất các thông tin sẵn sàng..." -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Việc mở %s bị lỗi" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Việc ghi tập tin %s bị lỗi" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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: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)" @@ -2423,7 +2439,7 @@ msgstr "" msgid "Opening %s" msgstr "Đang mở %s..." -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "Dòng %u quá dài trong danh sách nguồn %s." @@ -2510,17 +2526,17 @@ msgstr "Không tìm thấy trình điều khiển phương pháp %s." msgid "Method %s did not start correctly" msgstr "Phương pháp %s đã không bắt đầu cho đúng." -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Hãy nạp đĩa có nhãn « %s » vào ổ « %s » và bấm nút Enter." -#: apt-pkg/init.cc:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Không hỗ trợ hệ thống đóng gói « %s »" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp" @@ -2568,92 +2584,109 @@ msgstr "Bộ nhớ tạm có hệ thống điêu khiển phiên bản không tư msgid "Error occurred while processing %s (NewPackage)" msgstr "Gặp lỗi khi xử lý %s (NewPackage - gói mới)" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Gặp lỗi khi xử lý %s (UsePackage1 - dùng gói 1)" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Gặp lỗi khi xử lý %s (NewFileVer1 - tập tin mới, phiên bản 1)" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Gặp lỗi khi xử lý %s (UsePackage2 - dùng gói 2)" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Gặp lỗi khi xử lý %s (NewFileVer1 - tập tin mới, phiên bản 1)" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Gặp lỗi khi xử lý %s (NewVersion1 - phiên bản mới 1)" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Gặp lỗi khi xử lý %s (UsePackage3 - dùng gói 3)" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Gặp lỗi khi xử lý %s (NewVersion2 - phiên ban mới 2)" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Gặp lỗi khi xử lý %s (NewFileVer1 - tập tin mới, phiên bản 1)" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý." -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý." -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý." + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý." -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Gặp lỗi khi xử lý %s (FindPkg - tìm gói)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" "Gặp lỗi khi xử lý %s (CollectFileProvides - tập hợp các trường hợp miễn là " "một tập tin)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Không tìm thấy gói %s %s khi xử lý cách phụ thuộc của/vào tập tin" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "Đang tập hợp các trường hợp « tập tin miễn là »" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "MD5Sum (tổng kiểm) không khớp được" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2662,7 +2695,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:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2671,7 +2704,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:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2679,7 +2712,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:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "Kích cỡ không khớp được" @@ -2688,7 +2721,7 @@ msgstr "Kích cỡ không khớp được" msgid "Vendor block %s contains no fingerprint" msgstr "Khối nhà bán %s không chứa vân tay" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2697,47 +2730,49 @@ msgstr "" "Đang dùng điểm lắp đĩa CD-ROM %s\n" "Đang lắp đĩa CD-ROM...\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "Đang nhận diện... " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "Nhãn đã lưu : %s\n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Đang dùng điểm lắp đĩa CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "Đang tháo lắp đĩa CD-ROM...\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "Đang đợi đĩa...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "Đang lắp đĩa CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation 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:737 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:753 #, c-format msgid "" "This disc is called: \n" @@ -2746,38 +2781,38 @@ msgstr "" "Tên đĩa này:\n" "%s\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 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:783 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:792 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 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "Đang tháo lắp đĩa CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Mới ghi %i mục ghi.\n" -#: 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 "Mới ghi %i mục ghi với %i tập tin còn thiếu.\n" -#: 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 "Mới ghi %i mục ghi với %i tập tin không khớp với nhau\n" -#: apt-pkg/indexcopy.cc:269 +#: 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 "" @@ -2834,21 +2869,16 @@ msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s..." msgid "Completely removed %s" msgstr "Mới gỡ bỏ hoàn toàn %s" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Không thể mở tập tin %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Kết nối bị đóng quá sớm." -#~ msgid "File date has changed %s" -#~ msgstr "Ngày tập tin đã đổi %s" - -#~ msgid "Reading file list" -#~ msgstr "Đang đọc danh sách tâp tin..." - -#~ msgid "Could not execute " -#~ msgstr "Không thể thực hiện " - -#~ msgid "Preparing for remove with config %s" -#~ msgstr "Đang chuẩn bị gỡ bỏ với cấu hình %s..." - -#~ msgid "Removed with config %s" -#~ msgstr "Mới gỡ bỏ với cấu hình %s" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +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" diff --git a/po/zh_CN.po b/po/zh_CN.po index c76a4abd9..06ea0e977 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" +"POT-Creation-Date: 2006-08-15 15:55+0200\n" "PO-Revision-Date: 2006-02-22 14:20+1300\n" "Last-Translator: Carlos Z.F. Liu <carlosliu@users.sourceforge.net>\n" "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n" @@ -15,145 +15,155 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "版本为 %2$s 的软件包 %1$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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "未发现软件包 %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "软件包总数(按名称计)：" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " 普通软件包：" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " 完全虚拟软件包：" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " 单虚拟软件包：" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " 混合虚拟软件包：" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " 缺漏的：" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "按版本共计：" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "按版本共计：" + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "按依赖关系共计：" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "按版本/文件关系共计：" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "按版本/文件关系共计：" + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "提供映射共计：" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Glob 字串共计：" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "依赖关系版本名所占空间共计：" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Slack 空间共计：" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "总占用空间：" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "软件包文件 %s 尚未同步(sync)。" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "您必须明确地给出一个表达式" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "没有发现吻合的软件包" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "软件包文件：" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "缓存尚未同步(sync)，无法交差引证(x-ref)一个软件包文件" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "被锁定(pinned)的软件包：" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(没有找到)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr " 已安装：" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(无)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " 候选的软件包：" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " 软件包锁(Pin)：" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " 版本列表：" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s ，编译于 %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -300,7 +310,7 @@ msgstr "" " -c=? 读指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "无法写入 %s" @@ -742,118 +752,118 @@ msgstr "要卸载 %lu 个软件包，有 %lu 个软件未被升级。\n" msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "正在更正依赖关系..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " 失败。" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "无法更正依赖关系" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "无法最小化要升级的软件包集合" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " 完成" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "不能满足依赖关系。不妨试一下 -f 选项。" -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "【警告】：下列的软件包不能通过验证！" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "忽略了认证警告。\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "不经验证就安装这些软件包么？[y/N] " -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "有些软件包不能通过验证" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。" -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "内部错误，Ordering 没有完成" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "无法对下载目录加锁" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "无法读取安装源列表。" -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "怪了……文件大小不符，发信给 apt@packages.debian.org 吧" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需要下载 %sB/%sB 的软件包。\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需要下载 %sB 的软件包。\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的空余空间" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "您在 %s 中没有足够的空余空间。" -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "虽然您指定了 Trivial Only，但这不是个日常(trivial)操作。" -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:869 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -864,28 +874,28 @@ msgstr "" "若还想继续的话，就输入下面的短句“%s”\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "中止执行。" -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n]" -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "有一些文件下载失败" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -893,47 +903,47 @@ msgstr "" "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项" "再试试？" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "无法更正缺少的软件包。" -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "放弃安装。" -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "注意，我选了 %s 而非 %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "软件包 %s 还未安装，因而不会被卸载\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [已安装]" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "请您明确地选择一个来进行安装。" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -944,75 +954,75 @@ msgstr "" "这可能意味着这个缺失的软件包可能已被废弃，\n" "或者只能在其他发布源中找到\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "可是下列的软件包取代了它：" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "软件包 %s 还没有可供安装的候选者" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "不能重新安装 %s，因为无法下载它。\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 已经是最新的版本了。\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”发布版本" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”版本" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "选定了版本为 %s (%s) 的 %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr " update 命令是不需任何参数的" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "无法对状态列表目录加锁" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。" -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "下列的信息可能会对解决问题有所帮助：" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "内部错误，problem resolver 坏事了" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误，AllUpgrade 坏事了" @@ -1539,9 +1549,9 @@ 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:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "正在读取软件包列表" @@ -1674,11 +1684,13 @@ msgid "File not found" msgstr "无法找到该文件" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: 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/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "无法设置文件的修改日期" @@ -1805,7 +1817,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "把文件加入散列表时出错" @@ -1926,86 +1938,86 @@ msgid "" "available:\n" msgstr "由于没有公钥，下列签名无法进行验证：\n" -#: methods/gzip.cc:57 +#: 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:102 methods/gzip.cc:109 #, c-format msgid "Read error from %s process" msgstr "从 %s 进程读取数据出错" -#: methods/http.cc:376 +#: methods/http.cc:375 msgid "Waiting for headers" msgstr "正在等待报头" -#: methods/http.cc:522 +#: methods/http.cc:521 #, c-format msgid "Got a single header line over %u chars" msgstr "受到了一行报头条目，它的长度超过了 %u 个字符" -#: methods/http.cc:530 +#: methods/http.cc:529 msgid "Bad header line" msgstr "错误的报头条目" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "该 http 服务器发送了一个无效的应答报头" -#: methods/http.cc:585 +#: methods/http.cc:584 msgid "The HTTP server sent an invalid Content-Length header" msgstr "该 http 服务器发送了一个无效的 Content-Length 报头" -#: methods/http.cc:600 +#: methods/http.cc:599 msgid "The HTTP server sent an invalid Content-Range header" msgstr "该 http 服务器发送了一个无效的 Content-Range 报头" -#: methods/http.cc:602 +#: methods/http.cc:601 msgid "This HTTP server has broken range support" msgstr "该 http 服务器的 range 支持不正常" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "连接服务器超时" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "写文件时出错" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "写文件时出错" -#: methods/http.cc:874 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:876 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "内部错误" @@ -2018,7 +2030,7 @@ msgstr "无法 mmap 一个空文件" msgid "Couldn't make mmap of %lu bytes" msgstr "无法 mmap %lu 字节的数据" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "没有发现您的所选 %s" @@ -2078,12 +2090,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... 完成" @@ -2215,108 +2227,110 @@ msgstr "用 unlink 删除文件时出错" msgid "Problem syncing the file" msgstr "同步文件时出错" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "软件包缓存区是空的" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "软件包缓存区文件损坏了" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "软件包缓存区文件的版本不兼容" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "本程序目前不支持“%s”这个版本控制系统" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "软件包缓存区是为其它架构的主机构造的" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "依赖" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "预依赖" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "建议" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "推荐" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "冲突" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "替换" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "废弃" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "重要" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "必要" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "标准" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "可选" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "额外" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "正在分析软件包的依赖关系树" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "候选版本" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "生成依赖关系" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "正在合并现有信息" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "无法打开 %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "无法写入文件 %s" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "无法解析软件包文件 %s (2)" @@ -2351,7 +2365,7 @@ msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)" msgid "Opening %s" msgstr "正在打开 %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。" @@ -2439,17 +2453,17 @@ msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。" msgid "Method %s did not start correctly" msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" -#: apt-pkg/acquire-worker.cc:384 +#: 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:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "不支持“%s”打包系统" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "无法确定适合的打包系统类型" @@ -2492,90 +2506,107 @@ msgstr "软件包暂存区使用的是不兼容的版本控制系统" msgid "Error occurred while processing %s (NewPackage)" msgstr "处理 %s (NewPackage)时出错" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "处理 %s (UsePackage1)时出错" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "处理 %s (NewFileVer1)时出错" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "处理 %s (UsePackage2)时出错" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "处理 %s (NewFileVer1)时出错" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "处理 %s (NewVersion1)时出错" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "处理 %s (UsePackage3)时出错" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "处理 %s (NewVersion2)时出错" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "处理 %s (NewFileVer1)时出错" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "糟了，软件包的数量了超出本程序的处理能力。" -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "糟了，软件包版本的数量了超出本程序的处理能力。" -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "糟了，软件包版本的数量了超出本程序的处理能力。" + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "糟了，依赖关系的数量超出了本程序的处理能力。" -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "处理 %s (FindPkg)时出错" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "处理 %s (CollectFileProvides)时出错" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "当处理文件依赖关系时，无法找到软件包 %s %s" -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "无法获取源软件包列表 %s 的状态" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "正在收集文件所提供的软件包" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "无法写入来源缓存文件" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "无法重命名文件，%s (%s -> %s)。" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "MD5 校验和不符" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" msgstr "以下 key ID 没有可用的公钥：\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2584,7 +2615,7 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:818 +#: apt-pkg/acquire-item.cc:1269 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2592,13 +2623,13 @@ msgid "" msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" -#: apt-pkg/acquire-item.cc:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" -#: apt-pkg/acquire-item.cc:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "大小不符" @@ -2607,7 +2638,7 @@ msgstr "大小不符" msgid "Vendor block %s contains no fingerprint" msgstr "软件提供者数据块内 %s 没有包含指纹信息" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2616,47 +2647,49 @@ msgstr "" "现把 %s 作为了 CD-ROM 的挂载点\n" "正在挂载 CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "正在鉴别.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "存档标签：%s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "现把 %s 作为了 CD-ROM 的挂载点\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "正在卸载 CD-ROM 文件系统\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "等待插入盘片……\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "正在挂载 CD-ROM 文件系统……\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "正在光盘中查找索引文件..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "找到了 %i 个软件包索引、%i 个源代码包索引，和 %i 个数字签名\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "这不是一个有效的名字，请再次命名。\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2665,38 +2698,38 @@ msgstr "" "这张光盘现在的名字是：\n" "“%s”\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "正在复制软件包列表……" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "正在写入新的软件包源列表\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "对应于该光盘的软件包源设置项是：\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "正在卸载 CD-ROM 文件系统……" -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "已写入 %i 条记录。\n" -#: 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 "已写入 %i 条记录，并有 %i 个文件缺失。\n" -#: 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 "已写入 %i 条记录，并有 %i 个文件不吻合\n" -#: 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 "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n" @@ -2751,10 +2784,20 @@ msgstr "正在准备配置 %s" msgid "Completely removed %s" msgstr "无法删除 %s" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "无法打开文件 %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "连接被永久关闭" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +msgid "There is no public key available for the following key IDs:\n" +msgstr "以下 key ID 没有可用的公钥：\n" + #~ msgid "File date has changed %s" #~ msgstr "文件 %s 的时间已被改动" diff --git a/po/zh_TW.po b/po/zh_TW.po index ffa84044c..9ec8c24ad 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,153 +8,163 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-09 23:46+0200\n" -"PO-Revision-Date: 2005-02-19 22:24+0800\n" +"POT-Creation-Date: 2006-08-15 15:55+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" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "套件 %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 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "無法找出套件 %s 的位置" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "所有套件的名稱" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr " 普通套件：" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr " 虛擬套件：" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr " 單虛擬套件：" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr " 混合虛擬套件：" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr " 失蹤：" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "所有不同版本" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "所有不同版本" + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "所有依存關係：" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "所有版本/檔案關聯：" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "所有版本/檔案關聯：" + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "所有提供套件對應：" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "Glob 字串共計:" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "所有相依版本空間:" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "Slack 空間共計:" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "所有統計後的空間:" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "套件檔案 %s 已失去同步。" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "您必須給定一完整的樣式" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "未找到套件" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "套件檔案:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "快取資料同步過時,無法 x-ref 套件檔案" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "鎖定的套件:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "(未找到)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr "已安裝:" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "(沒有)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " 候選:" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr " 套件鎖定: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr " 版本表格:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 #: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s 是針對於 %s %s 並編譯在 %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -230,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 "請給這張光碟取個名字，比如說“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" @@ -305,7 +311,7 @@ msgstr "" " -c=? 讀取指定的設定檔案\n" " -o=? 設定任意指定的設定選項,例如:-o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817 #, c-format msgid "Unable to write to %s" msgstr "無法寫入『%s』。" @@ -339,7 +345,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" @@ -442,7 +447,7 @@ 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 "" +msgstr "資料庫格式錯誤。如果您升級舊版的 apt，請移除並重建資料庫。" #: ftparchive/cachedb.cc:81 #, c-format @@ -539,14 +544,14 @@ msgid " %s maintainer is %s not %s\n" msgstr " %s 套件維護者是 %s 非 %s\n" #: ftparchive/writer.cc:623 -#, fuzzy, c-format +#, c-format msgid " %s has no source override entry\n" -msgstr " %s 無 override 項目\n" +msgstr " %s 無原始碼 override 項目\n" #: ftparchive/writer.cc:627 -#, fuzzy, c-format +#, c-format msgid " %s has no binary override entry either\n" -msgstr " %s 無 override 項目\n" +msgstr " %s 無二元碼 override 項目\n" #: ftparchive/contents.cc:317 #, c-format @@ -716,12 +721,11 @@ msgid "%s (due to %s) " msgstr "%s（因為 %s）" #: cmdline/apt-get.cc:547 -#, 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:578 @@ -749,120 +753,119 @@ msgstr "刪除 %lu 個套件，另不更新 %lu 個套件。\n" msgid "%lu not fully installed or removed.\n" msgstr "%lu 個套件沒有完全安裝或刪除完畢。\n" -#: cmdline/apt-get.cc:650 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "更正依存關係中..." -#: cmdline/apt-get.cc:653 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr "失敗" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "無法更正依存關係。" -#: cmdline/apt-get.cc:659 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "無法最小化升級的套件集合" -#: cmdline/apt-get.cc:661 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " 完成" -#: cmdline/apt-get.cc:665 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "用『apt-get -f install』指令或許能修正這些問題。" -#: cmdline/apt-get.cc:668 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "無法滿足相依關係。試試看 -f 選項。" -#: cmdline/apt-get.cc:690 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "警告：下列的套件驗證失敗！" -#: cmdline/apt-get.cc:694 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "忽略了認證警告。\n" -#: cmdline/apt-get.cc:701 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "不驗證這些套件就直接安裝？[y/N]" -#: cmdline/apt-get.cc:703 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "部份套件無法驗證" -#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes" -#: cmdline/apt-get.cc:756 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "內部錯誤，InstallPackages 被用在了無法安裝的套上！" -#: cmdline/apt-get.cc:765 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "有套件需要被移除,但移除動作被禁止。" -#: cmdline/apt-get.cc:776 -#, fuzzy +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" -msgstr "內部錯誤：新增轉移(diversion)失敗" +msgstr "內部錯誤，Ordering didn't finish" -#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926 msgid "Unable to lock the download directory" msgstr "無法鎖定下載的目錄" -#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "無法讀取來源單。" -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "" +msgstr "怪了……檔案大小不符，發信給 apt@packages.debian.org 吧" -#: cmdline/apt-get.cc:822 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需要下載 %2$sB 中 %1$sB 的檔案。\n" -#: cmdline/apt-get.cc:825 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需要下載 %sB 的檔案。\n" -#: cmdline/apt-get.cc:830 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "解壓縮後將消耗 %sB 的空間。\n" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "解壓縮後將空出 %sB 的空間。\n" -#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064 -#, fuzzy, c-format +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064 +#, c-format msgid "Couldn't determine free space in %s" -msgstr "『%s』內沒有足夠的空間。" +msgstr "%s 無法足夠的空間。" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "『%s』內沒有足夠的空間。" -#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "雖然您指定了 Trivial Only,但這不是個顯而易懂的(trivial)操作。" -#: cmdline/apt-get.cc:867 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "是的,請執行我所指定的" -#: cmdline/apt-get.cc:869 -#, fuzzy, c-format +#: cmdline/apt-get.cc:883 +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" @@ -872,28 +875,28 @@ msgstr "" "若要繼續的話,就輸入下面的句子“%s”\n" " ?] " -#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "放棄執行。" -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 " -#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107 #, c-format msgid "Failed to fetch %s %s\n" msgstr "無法下載『%s』檔案。%s\n" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "部份檔案無法下載" -#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116 msgid "Download complete and in download only mode" msgstr "下載完畢,目前是“僅下載”模式" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -901,47 +904,47 @@ msgstr "" "有幾個檔案無法下載,您可以執行 apt-get update 或者嘗試加上--fix-missing \n" "選項?" -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前還不支援 --fix-missing 和媒體置換(media swapping)" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "無法更正遺失的套件。" -#: cmdline/apt-get.cc:997 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "放棄安裝。" -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "注意,選擇了 %s 而非 %s\n" -#: cmdline/apt-get.cc:1041 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽略 %s,它已經被安裝而且沒有指定要升級。\n" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "套件『%s』沒有安裝，所以無法刪除。\n" -#: cmdline/apt-get.cc:1070 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "虛擬套件『%s』的提供者是：\n" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr "【已安裝】" -#: cmdline/apt-get.cc:1087 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "請您明確地選擇一個來進行安裝。" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -952,74 +955,74 @@ msgstr "" "這可能意味著這個套件已經消失或捨棄,\n" "或者只能在其他原碼中找到\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "但是下列的套件將取代它：" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "套件 %s 還沒有可供安裝的候選版本" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "不能重新安裝 %s,因為無法下載它。\n" -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "『%s』已經是最新版本了。\n" -#: cmdline/apt-get.cc:1171 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”發布版本" -#: cmdline/apt-get.cc:1173 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”版本" -#: cmdline/apt-get.cc:1179 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "選定的版本為 %s (%s) 的 %s\n" -#: cmdline/apt-get.cc:1316 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "update 指令不需任何參數" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "無法鎖定列表目錄" -#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1401 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉而使用了舊的索引檔案。" -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1440 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642 msgid "The following information may help to resolve the situation:" msgstr "底下的資訊有助於解決現在的情況:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" -msgstr "內部錯誤,AllUpgrade 造成錯誤" +msgstr "內部錯誤，problem resolver 處理失敗" -#: cmdline/apt-get.cc:1463 +#: cmdline/apt-get.cc:1466 msgid "Internal error, AllUpgrade broke stuff" msgstr "內部錯誤,AllUpgrade 造成錯誤" @@ -1095,9 +1098,8 @@ msgid "Done" msgstr "完成" #: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869 -#, fuzzy msgid "Internal error, problem resolver broke stuff" -msgstr "內部錯誤,AllUpgrade 造成錯誤" +msgstr "內部錯誤，problem resolver 處理失敗" #: cmdline/apt-get.cc:1969 msgid "Must specify at least one package to fetch source for" @@ -1109,9 +1111,9 @@ msgid "Unable to find a source package for %s" msgstr "無法找到 %s 套件的源碼" #: cmdline/apt-get.cc:2043 -#, fuzzy, c-format +#, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "略過已經被解開到 %s 目錄的源碼檔案\n" +msgstr "略過已被下載的檔案“%s”\n" #: cmdline/apt-get.cc:2067 #, c-format @@ -1150,7 +1152,7 @@ msgstr "執行解開套件指令 '%s' 時失敗。\n" #: cmdline/apt-get.cc:2153 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "請檢查是否安裝了“dpkg-dev”套件。\n" #: cmdline/apt-get.cc:2170 #, c-format @@ -1462,7 +1464,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 失敗" @@ -1550,9 +1552,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:647 -#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721 -#: apt-pkg/pkgcachegen.cc:844 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824 +#: apt-pkg/pkgcachegen.cc:947 msgid "Reading package lists" msgstr "讀取套件清單中" @@ -1677,20 +1679,21 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "無法下駕『%s』內的碟片，或許它仍在使用中。" #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "找不到檔案" +msgstr "找不到磁碟" #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "找不到檔案" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 +#: 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/rred.cc:240 methods/gzip.cc:147 msgid "Failed to set modification time" msgstr "日期更新失敗" @@ -1816,7 +1819,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:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "問題雜湊表" @@ -1901,123 +1904,122 @@ msgid "Unable to connect to %s %s:" msgstr "無法聯絡到主機『%s %s』：" #: methods/gpgv.cc:65 -#, fuzzy, c-format +#, c-format msgid "Couldn't access keyring: '%s'" -msgstr "無法解析位置 %s" +msgstr "無法存取keyring：%s" #: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" +msgstr "錯誤：Acquire::gpgv::Options 的參數列表超長。結束執行。" #: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "" +msgstr "內部錯誤：簽名正確無誤，但是無法確認密鑰的指紋(key fingerprint)？！" #: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "至少發現一個無效的簽名。" #: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "" +msgstr "無法執行“%s”來驗證簽名(您安裝了 gnupg 嗎？)" #: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "執行 gpgv 時發生未知錯誤" #: methods/gpgv.cc:249 -#, fuzzy msgid "The following signatures were invalid:\n" -msgstr "下列的【新】套件都將被安裝：" +msgstr "下列的簽名皆不合法：\n" #: 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:57 methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" msgstr "無法開啟管線給 %s 使用" -#: methods/gzip.cc:102 +#: 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:375 msgid "Waiting for headers" msgstr "等待標頭" -#: methods/http.cc:522 +#: methods/http.cc:521 #, c-format msgid "Got a single header line over %u chars" msgstr "取得一個單行超過 %u 字元的標頭" -#: methods/http.cc:530 +#: methods/http.cc:529 msgid "Bad header line" msgstr "壞的標頭" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "http 伺服器傳送一個無效的回覆標頭" -#: methods/http.cc:585 +#: methods/http.cc:584 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http 伺服器傳送一個無效的 Content-Length 標頭" -#: methods/http.cc:600 +#: methods/http.cc:599 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http 伺服器傳送一個無效的 Content-Range 標頭" -#: methods/http.cc:602 +#: methods/http.cc:601 msgid "This HTTP server has broken range support" msgstr "http 伺服器有損毀的範圍支援" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "未知的資料格式" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "Select 失敗" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "連線逾時" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "寫入輸出檔時發生錯誤" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:874 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "從遠端主機讀取錯誤，關閉連線" -#: methods/http.cc:876 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "從伺服器讀取發生錯誤" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "壞的標頭資料" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "連線失敗" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "內部錯誤" @@ -2030,7 +2032,7 @@ msgstr "不能將空白檔案讀入記憶體" msgid "Couldn't make mmap of %lu bytes" msgstr "無法讀入檔案 %lu 位元組至記憶體" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "選項『%s』找不到。" @@ -2090,12 +2092,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: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:156 apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... 完成" @@ -2227,108 +2229,110 @@ msgstr "程式刪除檔案" msgid "Problem syncing the file" msgstr "程式同步檔案" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "套件暫存檔是空的。" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "套件暫存檔損壞。" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "套件暫存檔版本不符合。" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "本軟體不支持『%s』版本系統。" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "套件暫存檔是在另一種系統上產生的。" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "依存關係" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "特別依存關係" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "建議" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "推薦" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "衝突" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "取代" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "淘汰" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "important" msgstr "重要" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "required" msgstr "必要" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "標準" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "次要" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "添加" -#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98 +#: apt-pkg/depcache.cc:127 msgid "Building dependency tree" msgstr "了解套件依存關係中" -#: apt-pkg/depcache.cc:102 +#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99 msgid "Candidate versions" msgstr "候選版本" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128 msgid "Dependency generation" msgstr "產生套件依存關係" #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175 +#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 #, fuzzy msgid "Reading state information" msgstr "結合現有資料中" -#: apt-pkg/depcache.cc:199 +#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "無法開啟 %s" -#: apt-pkg/depcache.cc:205 +#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "寫入檔案 %s 失敗" -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 +#: 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:186 apt-pkg/tagfile.cc:193 #, c-format msgid "Unable to parse package file %s (2)" msgstr "無法辨識套件『%s』(1)。" @@ -2363,7 +2367,7 @@ msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本分辨)。" msgid "Opening %s" msgstr "開啟『%s』中" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "來源檔『%2$s』第 %1$u 行太長。" @@ -2374,7 +2378,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 行" @@ -2429,12 +2433,12 @@ msgstr "找不到『%spartial』檔案目錄。" #: apt-pkg/acquire.cc:823 #, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "" +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 @@ -2446,20 +2450,17 @@ msgstr "找不到安裝方式『%s』的驅動程式。" msgid "Method %s did not start correctly" msgstr "安裝方式『%s』沒有正確啟動。" -#: apt-pkg/acquire-worker.cc:384 -#, fuzzy, c-format +#: apt-pkg/acquire-worker.cc:377 +#, 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:122 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "本軟體不支持『%s』包裝法。" -#: apt-pkg/init.cc:138 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "無法明白系統類別。" @@ -2502,110 +2503,127 @@ msgstr "套件暫存檔使用的是不相容的版本系統。" msgid "Error occurred while processing %s (NewPackage)" msgstr "處理『%s』時發生錯誤 (NewPackage)。" -#: apt-pkg/pkgcachegen.cc:131 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "處理『%s』時發生錯誤 (UsePackage1)。" -#: apt-pkg/pkgcachegen.cc:152 +#: apt-pkg/pkgcachegen.cc:157 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "處理『%s』時發生錯誤 (NewFileVer1)。" + +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "處理『%s』時發生錯誤 (UsePackage2)。" -#: apt-pkg/pkgcachegen.cc:156 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "處理『%s』時發生錯誤 (NewFileVer1)。" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "處理『%s』時發生錯誤 (NewVersion1)。" -#: apt-pkg/pkgcachegen.cc:190 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "處理『%s』時發生錯誤 (UsePackage3)。" -#: apt-pkg/pkgcachegen.cc:194 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "處理『%s』時發生錯誤 (NewVersion2)。" -#: apt-pkg/pkgcachegen.cc:209 +#: apt-pkg/pkgcachegen.cc:249 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "處理『%s』時發生錯誤 (NewFileVer1)。" + +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "套件數量超過本程式的能力。" -#: apt-pkg/pkgcachegen.cc:212 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "套件版本數量超過本程式的能力。" -#: apt-pkg/pkgcachegen.cc:215 +#: apt-pkg/pkgcachegen.cc:261 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "套件版本數量超過本程式的能力。" + +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "依存關係數量超過本程式的能力。" -#: apt-pkg/pkgcachegen.cc:243 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "處理『%s』時發生錯誤 (FindPkg)。" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "處理『%s』時發生錯誤 (CollectFileProvides)。" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "當計算相依性時找不到套件 %s %s " -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:681 #, c-format msgid "Couldn't stat source package list %s" msgstr "無法讀取來源檔『%s』的目錄資料。" -#: apt-pkg/pkgcachegen.cc:662 +#: apt-pkg/pkgcachegen.cc:765 msgid "Collecting File Provides" msgstr "收集檔案供應" -#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899 msgid "IO Error saving source cache" msgstr "無法寫入來源暫存檔。" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "檔名因『%s』更換失敗 (%s → %s)。" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658 +#: apt-pkg/acquire-item.cc:1402 msgid "MD5Sum mismatch" msgstr "MD5 檢查碼不符合。" -#: apt-pkg/acquire-item.cc:646 +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy msgid "There are no public key available for the following key IDs:\n" -msgstr "" +msgstr "以下 key ID 沒有可用的公鑰：\n" -#: apt-pkg/acquire-item.cc:759 +#: apt-pkg/acquire-item.cc:1210 #, 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:818 +#: apt-pkg/acquire-item.cc:1269 #, 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:854 +#: apt-pkg/acquire-item.cc:1305 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。" -#: apt-pkg/acquire-item.cc:941 +#: apt-pkg/acquire-item.cc:1392 msgid "Size mismatch" msgstr "檔案大小不符合。" @@ -2614,7 +2632,7 @@ msgstr "檔案大小不符合。" msgid "Vendor block %s contains no fingerprint" msgstr "廠商區段%s有錯誤。" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2623,47 +2641,49 @@ msgstr "" "使用光碟機掛載點 %s\n" "掛載光碟機中\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "標識中.." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "保存標誌：%s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "使用光碟機掛載點 %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "卸載光碟機中\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "等待磁碟中...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "掛載光碟機中... \n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "掃描碟片中的索引檔案..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:673 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "找到 %i 個套件索引，%i 源碼索引和 %i 簽名\n" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "這不是合法名稱，重試一下。\n" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2672,96 +2692,106 @@ msgstr "" "這個碟片名為：\n" "'%s'\n" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "複製套件清單中" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "寫入新的來源列表中\n" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "該碟片的來源列表項目為：\n" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "卸載光碟機中..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "寫入 %i 筆紀錄。\n" -#: 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 "寫入 %i 筆遺失 %i 個檔案的紀錄。\n" -#: 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 "寫入 %i 筆 %i 個不匹配檔案的紀錄。\n" -#: 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 "寫入 %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/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "無法開啟『%s』檔案。" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "連線不預期的結束" +#: apt-pkg/acquire-item.cc:1097 +#, fuzzy +msgid "There is no public key available for the following key IDs:\n" +msgstr "以下 key ID 沒有可用的公鑰：\n" + #~ msgid "File date has changed %s" #~ msgstr "檔案資料已更改 %s" diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg Binary files differindex bb5ed5033..da1aa5e97 100644 --- a/share/debian-archive.gpg +++ b/share/debian-archive.gpg |