# 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
#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>
#include <unistd.h>
#include <errno.h>
#include <string>
+#include <sstream>
#include <stdio.h>
/*}}}*/
// We just downloaded something..
string FileName = LookupTag(Message,"Filename");
UsedMirror = LookupTag(Message,"UsedMirror");
- if (Complete == false && FileName == DestFile)
+ if (Complete == false && !Local && FileName == DestFile)
{
if (Owner->Log != 0)
Owner->Log->Fetched(Size,atoi(LookupTag(Message,"Resume-Point","0").c_str()));
}
+
+// 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;
void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
{
-
// no .bz2 found, retry with .gz
if(Desc.URI.substr(Desc.URI.size()-3) == "bz2") {
Desc.URI = Desc.URI.substr(0,Desc.URI.size()-3) + "gz";
if(Status == StatTransientNetworkError)
{
Item::Failed(Message,Cnf);
- // move the sigfile back on network failures (and re-authenticated?)
+ // move the sigfile back on transient network failures
if(FileExists(DestFile))
Rename(DestFile,Final);
// Move it into position
Rename(DestFile,FinalFile);
}
+ chmod(FinalFile.c_str(),0644);
DestFile = FinalFile;
}
}
}
- // 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",false) == true)
+ new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description,
+ (*Target)->ShortDesc, ExpectedIndexMD5);
+ else
+ new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description,
+ (*Target)->ShortDesc, ExpectedIndexMD5);
}
}
#include <apt-pkg/indexrecords.h>
-// Item to acquire
+/** \addtogroup acquire
+ * @{
+ *
+ * \file acquire-item.h
+ */
+
+/** \brief Represents the process by which a pkgAcquire object should
+ * retrieve a file or a collection of files.
+ *
+ * By convention, Item subclasses should insert themselves into the
+ * acquire queue when they are created by calling QueueURI(), and
+ * remove themselves by calling Dequeue() when either Done() or
+ * Failed() is invoked. Item objects are also responsible for
+ * notifying the download progress indicator (accessible via
+ * #Owner->Log) of their status.
+ *
+ * \see pkgAcquire
+ */
class pkgAcquire::Item
{
protected:
- // Some private helper methods for registering URIs
+ /** \brief The acquire object with which this item is associated. */
pkgAcquire *Owner;
+
+ /** \brief Insert this item into its owner's queue.
+ *
+ * \param ItemDesc Metadata about this item (its URI and
+ * description).
+ */
inline void QueueURI(ItemDesc &Item)
{Owner->Enqueue(Item);};
+
+ /** \brief Remove this item from its owner's queue. */
inline void Dequeue() {Owner->Dequeue(this);};
- // Safe rename function with timestamp preservation
+ /** \brief Rename a file without modifying its timestamp.
+ *
+ * Many item methods call this as their final action.
+ *
+ * \param From The file to be renamed.
+ *
+ * \param To The new name of #From. If #To exists it will be
+ * overwritten.
+ */
void Rename(string From,string To);
public:
- // State of the item
- enum {StatIdle, StatFetching, StatDone, StatError,
- StatAuthError, 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;
string UsedMirror;
- // 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;};
// report mirror problems
+ /** \brief Report mirror problem
+ *
+ * This allows reporting mirror failures back to a centralized
+ * server. The apt-report-mirror-failure script is called for this
+ *
+ * \param FailCode A short failure string that is send
+ */
void ReportMirrorFailure(string FailCode);
+
+ /** \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:
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="");
};
-// 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:
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:
virtual string Custom600Headers();
virtual string DescURI() {return RealURI; };
+ /** \brief Create a new pkgAcqMetaIndex. */
pkgAcqMetaIndex(pkgAcquire *Owner,
string URI,string URIDesc, string ShortDesc,
string SigFile,
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);
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:
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
##################################################################### */
/*}}}*/
+
+/** \addtogroup acquire
+ * @{
+ *
+ * \file acquire-method.h
+ */
+
#ifndef PKGLIB_ACQUIRE_METHOD_H
#define PKGLIB_ACQUIRE_METHOD_H
virtual ~pkgAcqMethod() {};
};
+/** @} */
+
#endif
##################################################################### */
/*}}}*/
+
+/** \addtogroup acquire
+ * @{
+ *
+ * \file acquire-worker.h
+ */
+
#ifndef PKGLIB_ACQUIRE_WORKER_H
#define PKGLIB_ACQUIRE_WORKER_H
#include <apt-pkg/acquire.h>
-// Interfacing to the method process
+/** \brief A fetch subprocess.
+ *
+ * A worker process is responsible for one stage of the fetch. This
+ * class encapsulates the communications protocol between the master
+ * process and the worker, from the master end.
+ *
+ * Each worker is intrinsically placed on two linked lists. The
+ * Queue list (maintained in the #NextQueue variable) is maintained
+ * by the pkgAcquire::Queue class; it represents the set of workers
+ * assigned to a particular queue. The Acquire list (maintained in
+ * the #NextAcquire variable) is maintained by the pkgAcquire class;
+ * it represents the set of active workers for a particular
+ * pkgAcquire object.
+ *
+ * \todo Like everything else in the Acquire system, this has way too
+ * many protected items.
+ *
+ * \sa pkgAcqMethod, pkgAcquire::Item, pkgAcquire
+ */
class pkgAcquire::Worker
{
friend class pkgAcquire;
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
##################################################################### */
/*}}}*/
+
+/** \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
#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:
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;
};
};
- // 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.
+ *
+ * \return \b true if the queuing was successful. May return
+ * \b false if the Item is already in the queue
+ */
bool Enqueue(ItemDesc &Item);
+
+ /** \brief Remove all fetch requests for the given item from this queue.
+ *
+ * \return \b true if at least one request was removed from the queue.
+ */
bool Dequeue(Item *Owner);
- // Find a Queued item
+ /** \brief Locate an item in this queue.
+ *
+ * \param URI A URI to match against.
+ * \param Owner A pkgAcquire::Worker to match against.
+ *
+ * \return the first item in the queue whose URI is #URI and that
+ * is being downloaded by #Owner.
+ */
QItem *FindItem(string URI,pkgAcquire::Worker *Owner);
+
+ /** Presumably this should start downloading an item?
+ *
+ * \todo Unimplemented. Implement it or remove?
+ */
bool ItemStart(QItem *Itm,unsigned long Size);
+
+ /** \brief Remove the given item from this queue and set its state
+ * to pkgAcquire::Item::StatDone.
+ *
+ * If this is the only queue containing the item, the item is also
+ * removed from the main queue by calling pkgAcquire::Dequeue.
+ *
+ * \param Itm The item to remove.
+ *
+ * \return \b true if no errors are encountered.
+ */
bool ItemDone(QItem *Itm);
+ /** \brief Start the worker process associated with this queue.
+ *
+ * If a worker process is already associated with this queue,
+ * this is equivalent to calling Cycle().
+ *
+ * \return \b true if the startup was successful.
+ */
bool Startup();
+
+ /** \brief Shut down the worker process associated with this queue.
+ *
+ * \param Final If \b true, then the process is stopped unconditionally.
+ * Otherwise, it is only stopped if it does not need cleanup
+ * as indicated by the pkgAcqMethod::NeedsCleanup member of
+ * its configuration.
+ *
+ * \return \b true.
+ */
bool Shutdown(bool Final);
+
+ /** \brief Send idle items to the worker process.
+ *
+ * Fills up the pipeline by inserting idle items into the worker's queue.
+ */
bool Cycle();
+
+ /** \brief Check for items that could be enqueued.
+ *
+ * Call this after an item placed in multiple queues has gone from
+ * the pkgAcquire::Item::StatFetching state to the
+ * pkgAcquire::Item::StatIdle state, to possibly refill an empty queue.
+ * This is an alias for Cycle().
+ *
+ * \todo Why both this and Cycle()? Are they expected to be
+ * different someday?
+ */
void Bump();
+ /** \brief Create a new Queue.
+ *
+ * \param Name The name of the new queue.
+ * \param Owner The download process that owns the new queue.
+ */
Queue(string Name,pkgAcquire *Owner);
+
+ /** Shut down all the worker processes associated with this queue
+ * and empty the queue.
+ */
~Queue();
};
+/** \brief Iterates over all the URIs being fetched by a pkgAcquire object. */
class pkgAcquire::UriIterator
{
+ /** The next queue to iterate over. */
pkgAcquire::Queue *CurQ;
+ /** The item that we currently point at. */
pkgAcquire::Queue::QItem *CurItem;
public:
- // Advance to the next item
inline void operator ++() {operator ++();};
+
void operator ++(int)
{
CurItem = CurItem->Next;
}
};
- // 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)
}
};
-// 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
#include <apti18n.h>
#include <sys/types.h>
+#include <cstdlib>
+#include <algorithm>
#include <iostream>
/*}}}*/
using namespace std;
#include <dirent.h>
#include <unistd.h>
#include <stdio.h>
+#include <algorithm>
#include "indexcopy.h"
if(log) {
msg.str("");
- ioprintf(msg, "Found label '%s'\n", Name.c_str());
+ ioprintf(msg, _("Found label '%s'\n"), Name.c_str());
log->Update(msg.str());
}
Database.Set("CD::" + ID + "::Label",Name);
// Unmount and finish
if (_config->FindB("APT::CDROM::NoMount",false) == false) {
- log->Update(_("Unmounting CD-ROM..."), STEP_LAST);
+ log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST);
UnmountCdrom(CDROM);
}
#include <apti18n.h>
+#include <cstdlib>
#include <iostream>
#include <unistd.h>
#include <fcntl.h>
#include <ctype.h>
#include <string.h>
#include <stdio.h>
+#include <algorithm>
#include <unistd.h>
#include <regex.h>
#include <errno.h>
return orig;
}
/*}}}*/
+
+static const char *SourceVerSeparators = " ()";
+
// RecordParser::SourcePkg - Return the source package name if any /*{{{*/
// ---------------------------------------------------------------------
/* */
string debRecordParser::SourcePkg()
{
string Res = Section.FindS("Source");
- string::size_type Pos = Res.find(' ');
+ string::size_type Pos = Res.find_first_of(SourceVerSeparators);
if (Pos == string::npos)
return Res;
return string(Res,0,Pos);
}
/*}}}*/
+// RecordParser::SourceVer - Return the source version number if present /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::SourceVer()
+{
+ string Pkg = Section.FindS("Source");
+ string::size_type Pos = Pkg.find_first_of(SourceVerSeparators);
+ if (Pos == string::npos)
+ return "";
+
+ string::size_type VerStart = Pkg.find_first_not_of(SourceVerSeparators, Pos);
+ if(VerStart == string::npos)
+ return "";
+
+ string::size_type VerEnd = Pkg.find_first_of(SourceVerSeparators, VerStart);
+ if(VerEnd == string::npos)
+ // Corresponds to the case of, e.g., "foo (1.2" without a closing
+ // paren. Be liberal and guess what it means.
+ return string(Pkg, VerStart);
+ else
+ return string(Pkg, VerStart, VerEnd - VerStart);
+}
+ /*}}}*/
// RecordParser::GetRec - Return the whole record /*{{{*/
// ---------------------------------------------------------------------
/* */
virtual string MD5Hash();
virtual string SHA1Hash();
virtual string SourcePkg();
+ virtual string SourceVer();
// These are some general stats about the package
virtual string Maintainer();
{
delete [] Buffer;
// allocate new size based on buffer (but never smaller than 4000)
- BufSize = max((unsigned long)4000, max((unsigned long)Bins.length()+1,2*BufSize));
+ BufSize = max((unsigned int)4000, max((unsigned int)Bins.length()+1,2*BufSize));
Buffer = new char[BufSize];
}
char *StaticBinList[400];
unsigned long iOffset;
char *Buffer;
- unsigned long BufSize;
+ unsigned int BufSize;
public:
std::clog << "Skipping already written " << pkg.Name() << std::endl;
continue;
}
- // skip not installed ones if requested
- if(InstalledOnly && pkg->CurrentVer == 0)
- continue;
+ // skip not installed ones if requested
+ if(InstalledOnly && pkg->CurrentVer == 0)
+ continue;
if(_config->FindB("Debug::pkgAutoRemove",false))
std::clog << "Writing new AutoInstall: "
<< pkg.Name() << std::endl;
// 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
std::clog << "Installing " << InstPkg.Name()
<< " as dep of " << Pkg.Name()
<< std::endl;
-
- // now check if we should consider it a automatic dependency or not
- string sec = _config->Find("APT::Never-MarkAuto-Section","");
- if(Pkg.Section() && (string(Pkg.Section()) == sec))
- {
- if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true)
- std::clog << "Setting NOT as auto-installed because its a direct dep of a package in section " << sec << std::endl;
- MarkInstall(InstPkg,true,Depth + 1, true, ForceImportantDeps);
- }
- else
- {
- // mark automatic dependency
- MarkInstall(InstPkg,true,Depth + 1, false, ForceImportantDeps);
- // Set the autoflag, after MarkInstall because MarkInstall unsets it
- if (P->CurrentVer == 0)
- PkgState[InstPkg->ID].Flags |= Flag::Auto;
- }
+ // now check if we should consider it a automatic dependency or not
+ string sec = _config->Find("APT::Never-MarkAuto-Section","");
+ if(Pkg.Section() && (string(Pkg.Section()) == sec))
+ {
+ if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true)
+ std::clog << "Setting NOT as auto-installed because its a direct dep of a package in section " << sec << std::endl;
+ MarkInstall(InstPkg,true,Depth + 1, true);
+ }
+ else
+ {
+ // mark automatic dependency
+ MarkInstall(InstPkg,true,Depth + 1, false, ForceImportantDeps);
+ // Set the autoflag, after MarkInstall because MarkInstall unsets it
+ if (P->CurrentVer == 0)
+ PkgState[InstPkg->ID].Flags |= Flag::Auto;
+ }
}
continue;
}
return false;
}
/*}}}*/
+
/* */
bool pkgIndexFile::TranslationsAvailable()
{
- const string Translation = _config->Find("APT::Acquire::Translation", "environment");
+ const string Translation = _config->Find("APT::Acquire::Translation");
if (Translation.compare("none") != 0)
return CheckLanguageCode(LanguageCode().c_str());
/* return the language code */
string pkgIndexFile::LanguageCode()
{
- const string Translation = _config->Find("APT::Acquire::Translation", "environment");
+ const string Translation = _config->Find("APT::Acquire::Translation");
if (Translation.compare("environment") == 0)
{
#include <apti18n.h>
#include <config.h>
+#include <cstdlib>
#include <sys/stat.h>
/*}}}*/
bindtextdomain(textdomain(0),Cnf.FindDir("Dir::Locale").c_str());
}
#endif
-
+ // Translation
+ Cnf.Set("APT::Acquire::Translation", "environment");
+
return true;
}
/*}}}*/
#include <apt-pkg/pkgsystem.h>
// See the makefile
-#define APT_PKG_MAJOR 3
-#define APT_PKG_MINOR 53
+#define APT_PKG_MAJOR 4
+#define APT_PKG_MINOR 4
#define APT_PKG_RELEASE 0
extern const char *pkgVersion;
# methods/makefile - FIXME
LIBRARY=apt-pkg
LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
-MAJOR=3.53
+MAJOR=4.4
MINOR=0
SLIBS=$(PTHREADLIB) $(INTLLIBS)
APT_DOMAIN:=libapt-pkg$(MAJOR)
virtual string MD5Hash() {return string();};
virtual string SHA1Hash() {return string();};
virtual string SourcePkg() {return string();};
+ virtual string SourceVer() {return string();};
// These are some general stats about the package
virtual string Maintainer() {return string();};
sheb sheb
shel sh
sh sh
+sh3 sh3
+sh4 sh4
+m32r m32r
hppa.* hppa
ia64 ia64
s390 s390
s390x s390x
x86_64 amd64
+# lipa has gnulp-linux-i.86 (see dpkg archtable and ostable)
DEBIANDOC_HTML = @DEBIANDOC_HTML@
DEBIANDOC_TEXT = @DEBIANDOC_TEXT@
+DOXYGEN = @DOXYGEN@
+
# SGML for the man pages
DOCBOOK2MAN := @DOCBOOK2MAN@
powerpc big 1 4 2 4
mips big 1 4 2 4
hppa big 1 4 2 4
+m32r big 1 4 2 4
\ No newline at end of file
--- /dev/null
+# This file contains a table of known canonical system strings, with
+# things to map them to. `configure' will take the output of the
+# autoconf cannon macros and look in here. It will check for
+# the full canonical system name (required for e.g. lpia) and if that
+# fails it will configure.in will fallback to just checking for the CPU
+# in buildlib/archtable
+
+# The left side is a regex for awk against the canonical system name
+
+# config.guess reports lpia as i386-unknown-linux-gnulp
+i.86-.*-linux-gnulp lpia
// 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);
}
}
bool DefRemove = false;
if (strcasecmp(CmdL.FileList[0],"remove") == 0)
DefRemove = true;
-
+ else if (strcasecmp(CmdL.FileList[0], "purge") == 0)
+ {
+ _config->Set("APT::Get::Purge", true);
+ DefRemove = true;
+ }
else if (strcasecmp(CmdL.FileList[0], "autoremove") == 0)
{
_config->Set("APT::Get::AutomaticRemove", "true");
DefRemove = true;
}
-
// new scope for the ActionGroup
{
pkgDepCache::ActionGroup group(Cache);
char *VerTag = 0;
bool VerIsRel = false;
- // this is a task!
- if (Length >= 1 && S[Length - 1] == '^')
- {
- S[--Length] = 0;
- // tasks must always be confirmed
- ExpectedInst += 1000;
- // see if we can install it
- TryInstallTask(Cache, Fix, BrokenFix, ExpectedInst, S);
- continue;
- }
+ // this is a task!
+ if (Length >= 1 && S[Length - 1] == '^')
+ {
+ S[--Length] = 0;
+ // tasks must always be confirmed
+ ExpectedInst += 1000;
+ // see if we can install it
+ TryInstallTask(Cache, Fix, BrokenFix, ExpectedInst, S);
+ continue;
+ }
while (Cache->FindPkg(S).end() == true)
{
}
else
{
-
if (VerTag != 0)
if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false)
return false;
}
}
if (!DoAutomaticRemove(Cache))
- return false;
+ return false;
/* Print out a list of packages that are going to be installed extra
to what the user asked */
I->Type != "tar")
continue;
+ // Dsc only mode only fetches .dsc files
+ if (_config->FindB("APT::Get::Dsc-Only",false) == true &&
+ I->Type != "dsc")
+ continue;
+
// don't download the same uri twice (should this be moved to
// the fetcher interface itself?)
if(queued.find(Last->Index().ArchiveURI(I->Path)) != queued.end())
" upgrade - Perform an upgrade\n"
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
+ " purge - Remove and purge packages\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
_config->Set("APT::Get::Fix-Broken",false);
_config->Set("APT::Get::Force-Yes",false);
_config->Set("APT::Get::List-Cleanup",true);
+ _config->Set("APT::Get::AutomaticRemove",false);
}
/*}}}*/
// SigWinch - Window size change signal handler /*{{{*/
{0,"force-yes","APT::Get::force-yes",0},
{0,"print-uris","APT::Get::Print-URIs",0},
{0,"diff-only","APT::Get::Diff-Only",0},
- {0,"tar-only","APT::Get::tar-Only",0},
+ {0,"tar-only","APT::Get::Tar-Only",0},
+ {0,"dsc-only","APT::Get::Dsc-Only",0},
{0,"purge","APT::Get::Purge",0},
{0,"list-cleanup","APT::Get::List-Cleanup",0},
{0,"reinstall","APT::Get::ReInstall",0},
# all done, rename the tmpfile
os.chmod(outfile.name, 0644)
os.rename(outfile.name, STATE_FILE)
+ os.chmod(outfile.name, 0644)
}
/*}}}*/
-int main(unsigned int argc,const char *argv[])
+int main(int argc,const char *argv[])
{
CommandLine::Args Args[] = {
{'h',"help","help",0},
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.4ubuntu11")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.2ubuntu1")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
dnl Converts the ARCH to be something singular for this general CPU family
dnl This is often the dpkg architecture string.
+dnl First check against the full canonical canoncial-system-type in $target
+dnl and if that fails, just look for the cpu
AC_MSG_CHECKING(system architecture)
-archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target_cpu\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/archtable`"
+archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/systemtable`"
if test "x$archset" = "x"; then
+ archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target_cpu\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/archtable`"
+ if test "x$archset" = "x"; then
AC_MSG_ERROR(failed: use --host= or check buildlib/archtable)
+ fi
fi
AC_MSG_RESULT($archset)
AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset")
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","")
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)
+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
--- /dev/null
+APT
+{
+ NeverAutoRemove
+ {
+ "^linux-image.*";
+ "^linux-restricted-modules.*";
+ };
+
+ Install-Recommends-Section "metapackages";
+ Never-MarkAuto-Section "metapackages";
+};
+++ /dev/null
-APT
-{
- NeverAutoRemove
- {
- "^linux-image.*";
- "^linux-restricted-modules.*";
- };
-
- Install-Recommends-Section "metapackages";
- Never-MarkAuto-Section "metapackages";
-};
DownloadUpgradeableInterval=0
eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages)
AutocleanInterval=$DownloadUpgradeableInterval
-eval $(apt-config shell AutocleanInterval APT::Periodic::Autoclean)
+eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval)
+
+UnattendedUpgradeInterval=0
+eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade)
+
UnattendedUpgradeInterval=0
eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade)
-apt (0.6.46.4ubuntu11) UNRELEASED; urgency=low
+apt (0.7.2ubuntu1) gutsy; urgency=low
+ * apt-pkg/deb/dpkgpm.cc:
+ - apport integration added, this means that a apport
+ report is written on dpkg failures
+ * merged from debian/unstable, remaining changes:
+ - maintainer field changed
+
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 14 Jun 2007 10:38:36 +0200
+
+apt (0.7.2) unstable; urgency=low
+
+ * merged the debian/experimental changes back
+ into the debian/sid branch
+ * merged from Christian Perrier:
+ * mr.po: New Marathi translation Closes: #416806
+ * zh_CN.po: Updated by Eric Pareja Closes: #416822
+ * tl.po: Updated by Eric Pareja Closes: #416638
+ * gl.po: Updated by Jacobo Tarrio
+ Closes: #412828
+ * da.po: Updated by Claus Hindsgaul
+ Closes: #409483
+ * fr.po: Remove a non-breakable space for usability
+ issues. Closes: #408877
+ * ru.po: Updated Russian translation. Closes: #405476
+ * *.po: Unfuzzy after upstream typo corrections
+ * buildlib/archtable:
+ - added support for sh3/sh4 (closes: #424870)
+ - added support for m32r (closes: #394096)
+ * buildlib/systemtable:
+ - added support for lpia
+ * configure.in:
+ - check systemtable for architecture mapping too
+ * fix error in AutocleanInterval, closes: #319339
+ (thanks to Israel G. Lugo for the patch)
+ * add "purge" commandline argument, closes: #133421)
+ (thanks to Julien Danjou for the patch)
+ * add "purge" commandline argument, closes: #133421)
+ (thanks to Julien Danjou for the patch)
+ * fix FTBFS with gcc 4.3, closes: #417090
+ (thanks to Martin Michlmayr for the patch)
+ * add --dsc-only option, thanks to K. Richard Pixley
+ * Removed the more leftover #pragma interface/implementation
+ closes: #306937 (thanks to Andreas Henriksson for the patch)
+
+ -- Michael Vogt <mvo@debian.org> Wed, 06 Jun 2007 23:19:50 +0200
+
+apt (0.7.1) experimental; urgency=low
+
+ * ABI library name change because its build against
+ new glibc
+ * implement SourceVer() in pkgRecords
+ (thanks to Daniel Burrows for the patch!)
+ * apt-pkg/algorithm.cc:
+ - use clog for all debugging
+ - only increase the score of installed applications if they
+ are not obsolete
+ - fix resolver bug on removal triggered by weak-dependencies
+ with or-groups
+ * methods/http.cc:
+ - send apt version in User-Agent
+ * apt-pkg/deb/debrecords.cc:
+ - fix SHA1Hash() return value
+ * apt-pkg/cdrom.cc:
+ - only unmount if APT::CDROM::NoMount is false
+ * methods/cdrom.cc:
+ - only umount if it was mounted by the method before
* po/gl.po:
- fix error in translation that causes trouble to lsb_release
(LP#79165)
* apt-pkg/acquire-item.cc:
- - if decompression of a index fails, delete the index (LP#68202)
+ - if decompression of a index fails, delete the index
* apt-pkg/acquire.{cc,h}:
- deal better with duplicated sources.list entries (avoid
double queuing of URLs) - this fixes hangs in bzip/gzip
issues. Closes: #408877
* ru.po: Updated Russian translation. Closes: #405476
* *.po: Unfuzzy after upstream typo corrections
+ * vi.po: Updated to 515t. Closes: #426976
+ * eu.po: Updated to 515t. Closes: #423766
+ * pt.po: 515t. Closes: #423111
+ * fr.po: Updated by Christian Perrier
+ * Update all PO and the POT. Gives 513t2f for formerly
+ complete translations
* apt-pkg/policy.cc:
- allow multiple packages (thanks to David Foerster)
- * apt-pkg/deb/dpkgpm.cc:
- - apport integration added, this means that a apport
- report is written on dpkg failures
-- Michael Vogt <michael.vogt@ubuntu.com> Tue, 17 Apr 2007 15:53:37 +0200
-- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Dec 2006 19:39:05 +0100
+apt (0.7.0) experimental; urgency=low
+
+ * Package that contains tall the new features
+ * Removed all #pragma interface/implementation
+ * Branch that contains tall the new features:
+ * translated package descriptions
+ * task install support
+ * automatic dependency removal (thanks to Daniel Burrows)
+ * merged support for the new dpkg "Breaks" field
+ (thanks to Ian Jackson)
+ * handle network failures more gracefully on "update"
+ * support for unattended-upgrades (via unattended-upgrades
+ package)
+ * added apt-transport-https method
+
+ -- Michael Vogt <mvo@debian.org> Fri, 12 Jan 2007 20:48:07 +0100
+
apt (0.6.46.4ubuntu3) feisty; urgency=low
* apt-pkg/algorithm.cc:
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.
+ * 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
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
Source: apt
Section: admin
Priority: important
-Maintainer: Michael Vogt <mvo@ubuntu.com>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
-Standards-Version: 3.6.2.2
+Standards-Version: 3.7.2.2
Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl3-gnutls-dev (>= 7.15.5)
Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)
XS-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/apt/ubuntu
cp debian/bugscript debian/$@/usr/share/bug/apt/script
cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
- cp debian/apt.conf.ubuntu debian/$@/etc/apt/apt.conf.d/01ubuntu
+ 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
--- /dev/null
+# 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
<arg>dselect-upgrade</arg>
<arg>install <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
<arg>remove <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>purge <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
<arg>source <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
<arg>build-dep <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
<arg>check</arg>
installed instead of removed.</para></listitem>
</varlistentry>
+ <varlistentry><term>purge</term>
+ <listitem><para><literal>purge</literal> is identical to <literal>remove</literal> except that packages are
+ removed and purged.</para></listitem>
+ </varlistentry>
+
<varlistentry><term>source</term>
<listitem><para><literal>source</literal> causes <command>apt-get</command> to fetch source packages. APT
will examine the available packages to decide which source package to
Item: <literal>APT::Get::Only-Source</literal>.</para></listitem>
</varlistentry>
- <varlistentry><term><option>--diff-only</option></term><term><option>--tar-only</option></term>
- <listitem><para>Download only the diff or tar file of a source archive.
- Configuration Item: <literal>APT::Get::Diff-Only</literal> and
+ <varlistentry><term><option>--diff-only</option></term><term><option>--dsc-only</option></term><term><option>--tar-only</option></term>
+ <listitem><para>Download only the diff, dsc, or tar file of a source archive.
+ Configuration Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</literal>, and
<literal>APT::Get::Tar-Only</literal>.</para></listitem>
</varlistentry>
Queue-Mode "host"; // host|access
Retries "0";
Source-Symlinks "true";
+
+ PDiffs "true"; // try to get the IndexFile diffs
// HTTP method configuration
http
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
#include <apti18n.h>
#include <algorithm>
+#include <climits>
#include <sys/time.h>
#include <regex.h>
BIN := $(BIN)/methods
# FIXME..
-LIB_APT_PKG_MAJOR = 3.53
+LIB_APT_PKG_MAJOR = 4.4
APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
# The file method
SOURCE = https.cc
include $(PROGRAM_H)
+# The https method
+PROGRAM=https
+SLIBS = -lapt-pkg -lcurl
+LIB_MAKES = apt-pkg/makefile
+SOURCE = https.cc
+include $(PROGRAM_H)
+
# The ftp method
PROGRAM=ftp
SLIBS = -lapt-pkg $(SOCKETLIBS)
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
--- /dev/null
+#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();
+}
+2007-06-01 Clytie Siddall <clytie@riverland.net.au>
+
+ * vi.po: Updated to 515t. Closes: #426976
+
+2007-05-13 Piarres Beobide <pi@beobide.net>
+
+ * eu.po: Updated to 515t. Closes: #423766
+
+2007-05-10 Miguel Figueiredo <elmig@debianpt.org>
+
+ * pt.po: 515t. Closes: #423111
+
+2007-05-08 Christian Perrier <bubulle@debian.org>
+
+ * fr.po: Updated by Christian Perrier
+
+2007-05-08 Christian Perrier <bubulle@debian.org>
+
+ * Update all PO and the POT. Gives 513t2f for formerly
+ complete translations
+
2007-04-01 priti Patil <prithisd@gmail.com>
* mr.po: New Marathi translation
2007-03-31 Kov Chai <tchaikov@sjtu.org>
- * zh_CN.po: Updated by Eric Pareja
+ * zh_CN.po: Updated by Kov Chai
Closes: #416822
2007-03-29 eric pareja <xenos@upm.edu.ph>
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-02 15:46+0200\n"
+"POT-Creation-Date: 2007-04-27 15:16+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"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:819
+#: apt-pkg/pkgcachegen.cc:815
#, c-format
msgid "Unable to write to %s"
msgstr ""
msgstr ""
#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
-#: apt-pkg/cachefile.cc:67
+#: apt-pkg/cachefile.cc:67 apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr ""
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
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
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:82
+#: apt-pkg/contrib/configuration.cc:747 apt-pkg/contrib/cdromutl.cc:150
+#: apt-pkg/sourcelist.cc:320 apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
#, c-format
msgid "Unable to read %s"
msgstr ""
msgstr ""
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:752
+#: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826
+#: apt-pkg/pkgcachegen.cc:949 apt-pkg/pkgcachegen.cc:748
+#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
+#: apt-pkg/pkgcachegen.cc:945
msgid "Reading package lists"
msgstr ""
msgstr ""
#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
-#: methods/gzip.cc:150
+#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr ""
#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
+#: methods/rred.cc:240
msgid "Failed to set modification time"
msgstr ""
msgstr ""
#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
+#: apt-pkg/contrib/fileutl.cc:469
msgid "Read error"
msgstr ""
msgstr ""
#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
+#: apt-pkg/contrib/fileutl.cc:508
msgid "Write error"
msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
msgid "Unable to invoke "
msgstr ""
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr ""
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr ""
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr ""
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr ""
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, 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:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:586
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:601
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:603
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr ""
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:875
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1108
+#: methods/http.cc:1110
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:82
+#: apt-pkg/contrib/mmap.cc:82 apt-pkg/contrib/mmap.cc:78
msgid "Can't mmap an empty file"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:87
+#: apt-pkg/contrib/mmap.cc:87 apt-pkg/contrib/mmap.cc:83
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:938
+#: apt-pkg/contrib/strutl.cc:981 apt-pkg/contrib/strutl.cc:978
#, c-format
msgid "Selection %s not found"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:436
+#: apt-pkg/contrib/configuration.cc:436 apt-pkg/contrib/configuration.cc:433
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:494
+#: apt-pkg/contrib/configuration.cc:494 apt-pkg/contrib/configuration.cc:491
#, c-format
msgid "Opening configuration file %s"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:512
+#: apt-pkg/contrib/configuration.cc:512 apt-pkg/contrib/configuration.cc:509
#, c-format
msgid "Line %d too long (max %d)"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:608
+#: apt-pkg/contrib/configuration.cc:608 apt-pkg/contrib/configuration.cc:605
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
-#: apt-pkg/contrib/configuration.cc:627
+#: apt-pkg/contrib/configuration.cc:627 apt-pkg/contrib/configuration.cc:624
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:644
+#: apt-pkg/contrib/configuration.cc:644 apt-pkg/contrib/configuration.cc:641
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:684 apt-pkg/contrib/configuration.cc:681
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:691 apt-pkg/contrib/configuration.cc:688
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
+#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:704
+#: apt-pkg/contrib/configuration.cc:704 apt-pkg/contrib/configuration.cc:701
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:738 apt-pkg/contrib/configuration.cc:735
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:155 apt-pkg/contrib/progress.cc:152
#, c-format
msgid "%c%s... Error!"
msgstr ""
-#: apt-pkg/contrib/progress.cc:157
+#: apt-pkg/contrib/progress.cc:157 apt-pkg/contrib/progress.cc:154
#, c-format
msgid "%c%s... Done"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:80
+#: apt-pkg/contrib/cmndline.cc:80 apt-pkg/contrib/cmndline.cc:77
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr ""
#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
-#: apt-pkg/contrib/cmndline.cc:122
+#: apt-pkg/contrib/cmndline.cc:122 apt-pkg/contrib/cmndline.cc:103
+#: apt-pkg/contrib/cmndline.cc:111 apt-pkg/contrib/cmndline.cc:119
#, c-format
msgid "Command line option %s is not understood"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:127
+#: apt-pkg/contrib/cmndline.cc:127 apt-pkg/contrib/cmndline.cc:124
#, c-format
msgid "Command line option %s is not boolean"
msgstr ""
#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
+#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
#, c-format
msgid "Option %s requires an argument."
msgstr ""
#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
+#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:237
+#: apt-pkg/contrib/cmndline.cc:237 apt-pkg/contrib/cmndline.cc:234
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:268
+#: apt-pkg/contrib/cmndline.cc:268 apt-pkg/contrib/cmndline.cc:265
#, c-format
msgid "Option '%s' is too long"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:301
+#: apt-pkg/contrib/cmndline.cc:301 apt-pkg/contrib/cmndline.cc:298
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:351
+#: apt-pkg/contrib/cmndline.cc:351 apt-pkg/contrib/cmndline.cc:348
#, c-format
msgid "Invalid operation %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:55
+#: apt-pkg/contrib/cdromutl.cc:55 apt-pkg/contrib/cdromutl.cc:52
#, 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
+#: methods/mirror.cc:88 apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424
+#: apt-pkg/clean.cc:40
#, c-format
msgid "Unable to change to %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:190
+#: apt-pkg/contrib/cdromutl.cc:190 apt-pkg/contrib/cdromutl.cc:187
msgid "Failed to stat the cdrom"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:82
+#: apt-pkg/contrib/fileutl.cc:82 apt-pkg/contrib/fileutl.cc:80
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:87
+#: apt-pkg/contrib/fileutl.cc:87 apt-pkg/contrib/fileutl.cc:85
#, c-format
msgid "Could not open lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:105
+#: apt-pkg/contrib/fileutl.cc:105 apt-pkg/contrib/fileutl.cc:103
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:109
+#: apt-pkg/contrib/fileutl.cc:109 apt-pkg/contrib/fileutl.cc:107
#, c-format
msgid "Could not get lock %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:377
+#: apt-pkg/contrib/fileutl.cc:377 apt-pkg/contrib/fileutl.cc:375
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:387
+#: apt-pkg/contrib/fileutl.cc:387 apt-pkg/contrib/fileutl.cc:385
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:390
+#: apt-pkg/contrib/fileutl.cc:390 apt-pkg/contrib/fileutl.cc:388
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:392
+#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:390
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:436
+#: apt-pkg/contrib/fileutl.cc:436 apt-pkg/contrib/fileutl.cc:434
#, c-format
msgid "Could not open file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:492
+#: apt-pkg/contrib/fileutl.cc:492 apt-pkg/contrib/fileutl.cc:490
#, c-format
msgid "read, still have %lu to read but none left"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:522
+#: apt-pkg/contrib/fileutl.cc:522 apt-pkg/contrib/fileutl.cc:520
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:597
+#: apt-pkg/contrib/fileutl.cc:597 apt-pkg/contrib/fileutl.cc:595
msgid "Problem closing the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:603
+#: apt-pkg/contrib/fileutl.cc:603 apt-pkg/contrib/fileutl.cc:601
msgid "Problem unlinking the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:614
+#: apt-pkg/contrib/fileutl.cc:614 apt-pkg/contrib/fileutl.cc:612
msgid "Problem syncing the file"
msgstr ""
-#: apt-pkg/pkgcache.cc:121
+#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
msgid "Empty package cache"
msgstr ""
-#: apt-pkg/pkgcache.cc:127
+#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
msgid "The package cache file is corrupted"
msgstr ""
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
msgid "The package cache file is an incompatible version"
msgstr ""
-#: apt-pkg/pkgcache.cc:137
+#: 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:142
+#: 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:213
+#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
msgid "Depends"
msgstr ""
-#: apt-pkg/pkgcache.cc:213
+#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
msgid "PreDepends"
msgstr ""
-#: apt-pkg/pkgcache.cc:213
+#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
msgid "Suggests"
msgstr ""
-#: apt-pkg/pkgcache.cc:214
+#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
msgid "Recommends"
msgstr ""
-#: apt-pkg/pkgcache.cc:214
+#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
msgid "Conflicts"
msgstr ""
-#: apt-pkg/pkgcache.cc:214
+#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
msgid "Replaces"
msgstr ""
-#: apt-pkg/pkgcache.cc:215
+#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
msgid "Obsoletes"
msgstr ""
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
msgid "important"
msgstr ""
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
msgid "required"
msgstr ""
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
msgid "standard"
msgstr ""
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
msgid "optional"
msgstr ""
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
msgid "extra"
msgstr ""
-#: apt-pkg/depcache.cc:58 apt-pkg/depcache.cc:87
+#: apt-pkg/depcache.cc:103 apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:100
+#: apt-pkg/depcache.cc:129
msgid "Building dependency tree"
msgstr ""
-#: apt-pkg/depcache.cc:59
+#: apt-pkg/depcache.cc:104 apt-pkg/depcache.cc:101
msgid "Candidate versions"
msgstr ""
-#: apt-pkg/depcache.cc:88
+#: apt-pkg/depcache.cc:133 apt-pkg/depcache.cc:130
msgid "Dependency generation"
msgstr ""
-#: apt-pkg/tagfile.cc:106
+#: apt-pkg/depcache.cc:154 apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:177
+#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+msgid "Reading state information"
+msgstr ""
+
+#: apt-pkg/depcache.cc:201 apt-pkg/depcache.cc:198
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr ""
+
+#: apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:204
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr ""
+
+#: apt-pkg/tagfile.cc:106 apt-pkg/tagfile.cc:102
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr ""
-#: apt-pkg/tagfile.cc:193
+#: apt-pkg/tagfile.cc:193 apt-pkg/tagfile.cc:189
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:94
+#: apt-pkg/sourcelist.cc:94 apt-pkg/sourcelist.cc:90
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:96 apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:99 apt-pkg/sourcelist.cc:95
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:105 apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:112 apt-pkg/sourcelist.cc:108
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:203
+#: apt-pkg/sourcelist.cc:203 apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 apt-pkg/sourcelist.cc:216
+#: apt-pkg/cdrom.cc:448
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:240
+#: apt-pkg/sourcelist.cc:240 apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:244 apt-pkg/sourcelist.cc:240
#, 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
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
-#: apt-pkg/packagemanager.cc:402
+#: apt-pkg/packagemanager.cc:403 apt-pkg/packagemanager.cc:399
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-#: apt-pkg/pkgrecords.cc:37
+#: apt-pkg/pkgrecords.cc:35 apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr ""
-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:248 apt-pkg/algorithms.cc:247
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1066
+#: apt-pkg/algorithms.cc:1104 apt-pkg/algorithms.cc:1103
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1068
+#: apt-pkg/algorithms.cc:1106 apt-pkg/algorithms.cc:1105
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/acquire.cc:62
+#: apt-pkg/acquire.cc:62 apt-pkg/acquire.cc:59
#, c-format
msgid "Lists directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:66
+#: apt-pkg/acquire.cc:66 apt-pkg/acquire.cc:63
#, c-format
msgid "Archive directory %spartial is missing."
msgstr ""
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:830 apt-pkg/acquire.cc:827
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:832
+#: apt-pkg/acquire.cc:832 apt-pkg/acquire.cc:829
#, c-format
msgid "Retrieving file %li of %li"
msgstr ""
-#: apt-pkg/acquire-worker.cc:113
+#: apt-pkg/acquire-worker.cc:113 apt-pkg/acquire-worker.cc:110
#, c-format
msgid "The method driver %s could not be found."
msgstr ""
-#: apt-pkg/acquire-worker.cc:162
+#: apt-pkg/acquire-worker.cc:162 apt-pkg/acquire-worker.cc:159
#, c-format
msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:384 apt-pkg/acquire-worker.cc:381
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:120
+#: apt-pkg/init.cc:123 apt-pkg/init.cc:126
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:136
+#: apt-pkg/init.cc:139 apt-pkg/init.cc:142
msgid "Unable to determine a suitable packaging system type"
msgstr ""
-#: apt-pkg/clean.cc:61
+#: apt-pkg/clean.cc:61 apt-pkg/clean.cc:57
#, c-format
msgid "Unable to stat %s."
msgstr ""
-#: apt-pkg/srcrecords.cc:48
+#: apt-pkg/srcrecords.cc:48 apt-pkg/srcrecords.cc:44
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
-#: apt-pkg/cachefile.cc:73
+#: apt-pkg/cachefile.cc:73 apt-pkg/cachefile.cc:69
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
-#: apt-pkg/cachefile.cc:77
+#: apt-pkg/cachefile.cc:77 apt-pkg/cachefile.cc:73
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
-#: apt-pkg/policy.cc:270
+#: apt-pkg/policy.cc:270 apt-pkg/policy.cc:267
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:292
+#: apt-pkg/policy.cc:292 apt-pkg/policy.cc:289
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:300
+#: apt-pkg/policy.cc:300 apt-pkg/policy.cc:297
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:76 apt-pkg/pkgcachegen.cc:72
msgid "Cache has an incompatible versioning system"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:119 apt-pkg/pkgcachegen.cc:115
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:134 apt-pkg/pkgcachegen.cc:130
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:157 apt-pkg/pkgcachegen.cc:153
+#, c-format
+msgid "Error occured while processing %s (NewFileDesc1)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:182 apt-pkg/pkgcachegen.cc:178
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:186 apt-pkg/pkgcachegen.cc:182
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:217 apt-pkg/pkgcachegen.cc:213
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:221 apt-pkg/pkgcachegen.cc:217
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:225 apt-pkg/pkgcachegen.cc:221
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:249 apt-pkg/pkgcachegen.cc:245
+#, c-format
+msgid "Error occured while processing %s (NewFileDesc2)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:255 apt-pkg/pkgcachegen.cc:251
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 apt-pkg/pkgcachegen.cc:254
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:261 apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:264 apt-pkg/pkgcachegen.cc:260
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:292 apt-pkg/pkgcachegen.cc:288
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:305 apt-pkg/pkgcachegen.cc:301
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:311 apt-pkg/pkgcachegen.cc:307
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:682 apt-pkg/pkgcachegen.cc:678
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:767 apt-pkg/pkgcachegen.cc:763
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901
+#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
msgid "IO Error saving source cache"
msgstr ""
-#: apt-pkg/acquire-item.cc:126
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
+#: apt-pkg/acquire-item.cc:293 apt-pkg/acquire-item.cc:1039
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:647
+#: apt-pkg/acquire-item.cc:733 apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:760
+#: apt-pkg/acquire-item.cc:847 apt-pkg/acquire-item.cc:1270
#, 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:819
+#: apt-pkg/acquire-item.cc:906 apt-pkg/acquire-item.cc:1329
#, 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:855
+#: apt-pkg/acquire-item.cc:942 apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:942
+#: apt-pkg/acquire-item.cc:1029 apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr ""
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/cdrom.cc:507
+#: apt-pkg/cdrom.cc:531 apt-pkg/cdrom.cc:529
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
+#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:538
+#: apt-pkg/cdrom.cc:620
msgid "Identifying.. "
msgstr ""
-#: apt-pkg/cdrom.cc:541
+#: apt-pkg/cdrom.cc:565 apt-pkg/cdrom.cc:563
#, c-format
msgid "Stored label: %s \n"
msgstr ""
-#: apt-pkg/cdrom.cc:561
+#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:583
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:579
+#: apt-pkg/cdrom.cc:603 apt-pkg/cdrom.cc:601
msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:583
+#: apt-pkg/cdrom.cc:607 apt-pkg/cdrom.cc:605
msgid "Waiting for disc...\n"
msgstr ""
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:615 apt-pkg/cdrom.cc:613
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:633 apt-pkg/cdrom.cc:631
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:647
+#: apt-pkg/cdrom.cc:673 apt-pkg/cdrom.cc:671
#, 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:712
+#: apt-pkg/cdrom.cc:739 apt-pkg/cdrom.cc:737
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:755 apt-pkg/cdrom.cc:753
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:732
+#: apt-pkg/cdrom.cc:759 apt-pkg/cdrom.cc:757
msgid "Copying package lists..."
msgstr ""
-#: apt-pkg/cdrom.cc:756
+#: apt-pkg/cdrom.cc:785 apt-pkg/cdrom.cc:783
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:765
+#: apt-pkg/cdrom.cc:794 apt-pkg/cdrom.cc:792
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/cdrom.cc:807
+#: apt-pkg/cdrom.cc:836
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 ""
-#: apt-pkg/deb/dpkgpm.cc:358
+#: apt-pkg/deb/dpkgpm.cc:358 apt-pkg/deb/dpkgpm.cc:357
#, c-format
msgid "Preparing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:359
+#: apt-pkg/deb/dpkgpm.cc:359 apt-pkg/deb/dpkgpm.cc:358
#, c-format
msgid "Unpacking %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:364
+#: apt-pkg/deb/dpkgpm.cc:364 apt-pkg/deb/dpkgpm.cc:363
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:365
+#: apt-pkg/deb/dpkgpm.cc:365 apt-pkg/deb/dpkgpm.cc:364
#, c-format
msgid "Configuring %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:366
+#: apt-pkg/deb/dpkgpm.cc:366 apt-pkg/deb/dpkgpm.cc:365
#, c-format
msgid "Installed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:371
+#: apt-pkg/deb/dpkgpm.cc:371 apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:372
+#: apt-pkg/deb/dpkgpm.cc:372 apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Removing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:373
+#: apt-pkg/deb/dpkgpm.cc:373 apt-pkg/deb/dpkgpm.cc:372
#, c-format
msgid "Removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:378
+#: apt-pkg/deb/dpkgpm.cc:378 apt-pkg/deb/dpkgpm.cc:377
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:379
+#: apt-pkg/deb/dpkgpm.cc:379 apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Completely removed %s"
msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr ""
+
+#: apt-pkg/cdrom.cc:708
+#, c-format
+msgid "Found label '%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:834
+msgid "Unmounting CD-ROM...\n"
+msgstr ""
+
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-12 20:14+0300\n"
"Last-Translator: Yavor Doganov <yavor@doganov.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
msgid "Wrong CD-ROM"
msgstr "Грешен CD-ROM"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Неуспех при демонтирането на CD-ROM в %s, може все още да се използва."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Дискът не е намерен."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Файлът не е намерен"
msgid "Unable to accept connection"
msgstr "Невъзможно е да се приеме свързването"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Проблем при хеширане на файла"
msgid "Read error from %s process"
msgstr "Грешка при четене от процес %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Чакане на заглавни части"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Получен е един ред на заглавна част с над %u символа"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Невалиден ред на заглавна част"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Неизвестен формат на дата"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Неуспех на избора"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Допустимото време за свързване изтече"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Грешка при записа на изходен файл"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Грешка при записа на файл"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Грешка при записа на файла"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Грешка при четене от сървъра"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Невалидни данни на заглавната част"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Неуспех при свързването"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Вътрешна грешка"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Грешка!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Готово"
"Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за "
"него."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е "
"причинено от задържани пакети."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Неуспех при коригирането на проблемите, имате задържани счупени пакети."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Изтегляне на файл %li от %li (остават %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Изтегляне на файл %li от %li"
msgstr ""
"Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Невалиден запис във файла с настройки, няма заглавна част Package"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Неизвестен тип за отбиване %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Няма указан приоритет (или е нула) на отбиването"
msgid "rename failed, %s (%s -> %s)."
msgstr "преименуването се провали, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Несъответствие на контролна сума MD5"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет (поради пропусната архитектура)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Несъответствие на размера"
"Намерени са %i индекса на пакети, %i индекса на пакети с изходен код и %i "
"подписа.\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Запазен етикет: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Това не е валидно име, опитайте отново.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Наименование на този диск: \n"
"„%s“\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Копиране на списъците с пакети..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Запазване на новия списък с източници\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Записите в списъка с източници за този диск са:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Демонтиране на CD-ROM..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2004-05-06 15:25+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
msgid "Wrong CD-ROM"
msgstr "Pogrešan CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Ne mogu demontirati CD-ROM na %s, moguće je da se još uvijek koristi."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
#, fuzzy
msgid "Disk not found."
msgstr "Datoteka nije pronađena"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Datoteka nije pronađena"
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Čekam na zaglavlja"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Nepoznat oblik datuma"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr ""
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Povezivanje neuspješno"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Unutrašnja greška"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr ""
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Čitam spisak datoteke"
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr ""
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, c-format
+msgid "Found label '%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
#, fuzzy
msgid "Copying package lists..."
msgstr "Čitam spiskove paketa"
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
-msgstr ""
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "Pogrešan CD"
#: apt-pkg/indexcopy.cc:261
#, c-format
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-02-05 22:00+0100\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
msgid "Wrong CD-ROM"
msgstr "CD erroni"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "No es pot muntar el CD-ROM en %s, potser estigui encara en ús."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "No s'ha trobat el disc"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fitxer no trobat"
msgid "Unable to accept connection"
msgstr "No es pot acceptar la connexió"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema escollint el fitxer"
msgid "Read error from %s process"
msgstr "Error llegint des del procés %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "S'estan esperant les capçaleres"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "S'ha aconseguit una sola línia de capçalera més de %u caràcters"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Línia de capçalera incorrecta"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "El servidor http ha enviat una capçalera de resposta no vàlida"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "El servidor http ha enviat una capçalera de Content-Length no vàlida"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "El servidor http ha enviat una capçalera de Content-Range no vàlida"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Aquest servidor http té el suport d'abast trencat"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Format de la data desconegut"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Ha fallat la selecció"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Connexió finalitzada"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Error escrivint en el fitxer d'eixida"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Error escrivint en el fitxer"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Error escrivint en el fitxer"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Error llegint, el servidor remot ha tancat la connexió"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Error llegint des del servidor"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Capçalera de dades no vàlida"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Ha fallat la connexió"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Error intern"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Error sintàctic %s:%u: Text extra al final del fitxer"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Error!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Fet"
msgstr ""
"El paquet %s necessita ser reinstal·lat, però no se li pot trobar un arxiu."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat "
"causat per paquets mantinguts."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"No es poden corregir els problemes, teniu paquets mantinguts que estan "
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "S'està obtenint el fitxer %li de %li (falten %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "S'està obtenint el fitxer %li de %li"
msgstr ""
"Potser voldreu executar apt-get update per a corregir aquests problemes"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Registre no vàlid en el fitxer de preferències, paquet sense capçalera"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "No s'ha entès el pin de tipus %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "No hi ha prioritat especificada per al pin (o és zero)"
msgid "rename failed, %s (%s -> %s)."
msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Suma MD5 diferent"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu "
"d'arreglar aquest paquet manualment."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
"per al paquet %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "La mida no concorda"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "S'han trobat %i índex de paquets, %i índex de fonts i %i signatures\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "S'ha emmagatzemat l'etiqueta: %s\n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Aquest no és un nom vàlid, torneu-ho a provar.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"El disc es diu:\n"
"«%s»\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "S'estan copiant les llistes de paquets..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "S'està escrivint una nova llista de fonts\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Les entrades de la llista de fonts per a aquest disc són:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "S'esta desmuntant el CD-ROM..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-04 18:53+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
msgid "Wrong CD-ROM"
msgstr "Chybné CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Nemohu odpojit CD-ROM v %s - možná se stále používá."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disk nebyl nalezen."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Soubor nebyl nalezen"
msgid "Unable to accept connection"
msgstr "Nemohu přijmout spojení"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hashováním souboru"
msgid "Read error from %s process"
msgstr "Chyba čtení z procesu %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Čekám na hlavičky"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Získal jsem jednu řádku hlavičky přes %u znaků"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Chybná hlavička"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Http server poslal neplatnou hlavičku odpovědi"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http server poslal neplatnou hlavičku Content-Length"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http server poslal neplatnou hlavičku Content-Range"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má porouchanou podporu rozsahů"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Neznámý formát data"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Výběr selhal"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Čas spojení vypršel"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupního souboru"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Chyba čtení ze serveru"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Špatné datové záhlaví"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Spojení selhalo"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Vnitřní chyba"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaktická chyba %s:%u: Na konci souboru je zbytečné smetí"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Chyba!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Hotovo"
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archiv."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno "
"podrženými balíky."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nemohu opravit problémy, některé balíky držíte v porouchaném stavu."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Stahuji soubor %li z %li (%s zbývá)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Stahuji soubor %li z %li"
msgid "You may want to run apt-get update to correct these problems"
msgstr "Pro nápravu těchto problémů můžete zkusit spustit apt-get update"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Neplatný záznam v souboru preferencí, žádné záhlaví balíku"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Nerozumím vypíchnutí typu %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita"
msgid "rename failed, %s (%s -> %s)."
msgstr "přejmenování selhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Neshoda MD5 součtů"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že "
"tento balík je třeba opravit ručně (kvůli chybějící architektuře)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík "
"opravit ručně."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Velikosti nesouhlasí"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Nalezl jsem indexy balíků (%i), indexy zdrojů (%i) a podpisy (%i)\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Uložený název: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Nejedná se o platné jméno, zkuste to znovu.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Tento disk se nazývá: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopíruji seznamy balíků..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Zapisuji nový seznam balíků\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Seznamy zdrojů na tomto disku jsou:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Odpojuji CD-ROM..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2005-06-06 13:46+0100\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
msgid "Wrong CD-ROM"
msgstr "CD Anghywir"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
"Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
#, fuzzy
msgid "Disk not found."
msgstr "Ffeil heb ei ganfod"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Ffeil heb ei ganfod"
msgid "Unable to accept connection"
msgstr "Methwyd derbyn cysylltiad"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem wrth stwnshio ffeil"
msgid "Read error from %s process"
msgstr "Gwall darllen o broses %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Yn aros am benawdau"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Llinell pennawd gwael"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
#, fuzzy
msgid "The HTTP server sent an invalid reply header"
msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
-#: methods/http.cc:585
+#: methods/http.cc:586
#, fuzzy
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
-#: methods/http.cc:600
+#: methods/http.cc:601
#, fuzzy
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
-#: methods/http.cc:602
+#: methods/http.cc:603
#, fuzzy
msgid "This HTTP server has broken range support"
msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Fformat dyddiad anhysbys"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Methwyd dewis"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Goramserodd y cysylltiad"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Gwall wrth ysgrifennu at ffeil"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Gwall wrth ysgrifennu at y ffeil"
-#: methods/http.cc:874
+#: methods/http.cc:875
#, fuzzy
msgid "Error reading from server. Remote end closed connection"
msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Gwall wrth ddarllen o'r gweinydd"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
#, fuzzy
msgid "Bad header data"
msgstr "Data pennawd gwael"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Methodd y cysylltiad"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Gwall mewnol"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Gwall!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Wedi Gorffen"
"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
"ei gyfer."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
"ei achosi gan pecynnau wedi eu dal."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Yn Darllen Rhestr Ffeiliau"
msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
# FIXME: literal
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
# FIXME: tense
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Methwyd daeall y math pin %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
msgid "rename failed, %s (%s -> %s)."
msgstr "methwyd ailenwi, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, c-format
+msgid "Found label '%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
#, fuzzy
msgid "Copying package lists..."
msgstr "Yn Darllen Rhestrau Pecynnau"
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
#, fuzzy
msgid "Writing new source list\n"
msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
-msgstr ""
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD Anghywir"
#: apt-pkg/indexcopy.cc:261
#, c-format
msgstr ""
"Project-Id-Version: apt-da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-19 11:37+0100\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2007-02-03 15:50+0100\n"
"Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
"Language-Team: Danish\n"
msgid "Wrong CD-ROM"
msgstr "Forkert cd"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Kunne ikke afmontere cdrommen i %s, den er muligvis stadig i brug."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disk blev ikke fundet."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fil blev ikke fundet"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Henter fil %li ud af %li (%s tilbage)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Henter fil %li ud af %li"
msgid "You may want to run apt-get update to correct these problems"
msgstr "Du kan muligvis rette problemet ved at køre 'apt-get update'"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Ugyldig indgang i indstillingsfilen. Pakkehovedet mangler"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Kunne ikke forstå pin-type %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin"
msgid "rename failed, %s (%s -> %s)."
msgstr "omdøbning mislykkedes, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum stemmer ikke"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"nødt til manuelt at reparere denne pakke. (grundet manglende arch)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"nødt til manuelt at reparere denne pakke."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Størrelsen stemmer ikke"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Fandt %i pakkeindekser, %i kildeindekser og %i signaturer\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Gemt mærkat: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Det er ikke et gyldigt navn, prøv igen.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Denne disk hedder: \n"
" %s \n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopierer pakkelisterne..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Skriver ny kildeliste\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Denne disk har følgende kildeliste-indgange:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Afmonterer cdrom..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: apt 0.6.46.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-24 11:45+0200\n"
"Last-Translator: Michael Piefel <piefel@debian.org>\n"
"Language-Team: <de@li.org>\n"
msgid "Wrong CD-ROM"
msgstr "Falsche CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
"Kann Einbindung von CD-ROM in %s nicht lösen, möglicherweise wird sie noch "
"verwendet."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disk nicht gefunden."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Datei nicht gefunden"
msgid "Unable to accept connection"
msgstr "Kann Verbindung nicht annehmen"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf"
msgid "Read error from %s process"
msgstr "Lesefehler von Prozess %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Warte auf Kopfzeilen (header)"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Schlechte Kopfzeile"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Der http-Server sandte eine ungültige Antwort-Kopfzeile"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Der http-Server sandte eine ungültige „Content-Length“-Kopfzeile"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Der http-Server sandte eine ungültige „Content-Range“-Kopfzeile"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft."
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Unbekanntes Datumsformat"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Auswahl fehlgeschlagen"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Verbindung erlitt Zeitüberschreitung"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Fehler beim Schreiben einer Ausgabedatei"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Fehler beim Schreiben einer Datei"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Fehler beim Schreiben der Datei"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung "
"geschlossen"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Fehler beim Lesen vom Server"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Fehlerhafte Kopfzeilendaten"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Verbindung fehlgeschlagen"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Interner Fehler"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll am Dateiende"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Fehler!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Fertig"
"Das Paket %s muss reinstalliert werden, ich kann aber kein Archiv dafür "
"finden."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Fehler: pkgProblemResolver::Resolve hat Unterbrechungen hervorgerufen, dies "
"könnte durch gehaltene Pakete hervorgerufen worden sein."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kann Probleme nicht korrigieren, Sie haben gehaltene kaputte Pakete."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Hole Datei %li von %li (noch %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Hole Datei %li von %li"
msgid "You may want to run apt-get update to correct these problems"
msgstr "Probieren Sie „apt-get update“, um diese Probleme zu korrigieren."
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Ungültiger Eintrag in Einstellungs-Datei, kein „Package“-Header"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Konnte Stecknadeltyp („pin type“) %s nicht verstehen"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Keine Priorität (oder Null) für Pin angegeben"
msgid "rename failed, %s (%s -> %s)."
msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5-Summe stimmt nicht"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie "
"dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie "
"dieses Paket von Hand korrigieren müssen."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Die Paketindexdateien sind korrumpiert: Kein Filename:-Feld für Paket %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Größe stimmt nicht"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Fand %i Paketindexe, %i Quellenindexe und %i Signaturen\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Gespeicherte Kennzeichnung: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Dies ist kein gültiger Name, versuchen Sie es erneut.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Diese CD heißt: \n"
"„%s“\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopiere Paketlisten..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Schreibe neue Quellliste\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Quelllisteneinträge für diese CD sind:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Hänge CD-ROM aus..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: apt_po_el_new\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-01-18 15:16+0200\n"
"Last-Translator: Konstantinos Margaritis <markos@debian.org>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
msgid "Wrong CD-ROM"
msgstr "Λάθος CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Αδυναμία απόσυναρμογής του CD-ROM στο %s, μπορεί να είναι σε χρήση."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Ο δίσκος δεν βρέθηκε."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Το αρχείο Δε Βρέθηκε"
msgid "Unable to accept connection"
msgstr "Αδύνατη η αποδοχή συνδέσεων"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Πρόβλημα κατά το hashing του αρχείου"
msgid "Read error from %s process"
msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Αναμονή επικεφαλίδων"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Ελαττωματική γραμμή επικεφαλίδας"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Άγνωστη μορφή ημερομηνίας"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Η επιλογή απέτυχε"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Λήξη χρόνου σύνδεσης"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Η σύνδεση απέτυχε"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Εσωτερικό Σφάλμα"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες στο τέλος του αρχείου"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Σφάλμα!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Ολοκληρώθηκε"
"Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση "
"κάποιας κατάλληλης αρχείοθήκης."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως "
"προκλήθηκε από κρατούμενα πακέτα."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, fuzzy, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Κατέβασμα του αρχείου %li του %li (απομένουν %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Ανάγνωση Λίστας Πακέτων"
msgstr ""
"Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Μη έγκυρη εγγραφή στο αρχείο προτιμήσεων, καμία επικεφαλίδα Package"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Αδύνατη η κατανόηση του τύπου καθήλωσης %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr ""
"Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση"
msgid "rename failed, %s (%s -> %s)."
msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
"πακέτο %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Ανόμοιο μέγεθος"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Βρέθηκαν %i κατάλογοι πακέτων, %i κατάλογοι πηγαίων και %i υπογραφές\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Αποθήκευση Ετικέτας: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Αυτό δεν είναι έγκυρο όνομα, προσπαθείστε ξανά. \n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Ο δίσκος αυτός ονομάζεται: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Αντιγραφή λιστών πακέτων..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Eγγραφή νέας λίστας πηγών\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Αποπροσάρτηση του CD-ROM..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: apt 0.6.46.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-12 11:07+0100\n"
"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
"Language-Team: en_GB <en_gb@li.org>\n"
msgid "Wrong CD-ROM"
msgstr "Wrong CD-ROM"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Unable to unmount the CD-ROM in %s, it may still be in use."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disk not found."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "File not found"
msgid "Unable to accept connection"
msgstr "Unable to accept connection"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem hashing file"
msgid "Read error from %s process"
msgstr "Read error from %s process"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Waiting for headers"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Got a single header line over %u chars"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Bad header line"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "The HTTP server sent an invalid reply header"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "The HTTP server sent an invalid Content-Length header"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "The HTTP server sent an invalid Content-Range header"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "This HTTP server has broken range support"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Unknown date format"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Select failed"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Connection timed out"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Error writing to output file"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Error writing to file"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Error writing to the file"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Error reading from server. Remote end closed connection"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Error reading from server"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Bad header data"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Connection failed"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Internal error"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntax error %s:%u: Extra junk at end of file"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Error!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Done"
msgstr ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Unable to correct problems, you have held broken packages."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Retrieving file %li of %li (%s remaining)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Retrieving file %li of %li"
msgid "You may want to run apt-get update to correct these problems"
msgstr "You may want to run apt-get update to correct these problems"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Invalid record in the preferences file, no Package header"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Did not understand pin type %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "No priority (or zero) specified for pin"
msgid "rename failed, %s (%s -> %s)."
msgstr "rename failed, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum mismatch"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "There is no public key available for the following key IDs:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"The package index files are corrupted. No Filename: field for package %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Size mismatch"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Found %i package indexes, %i source indexes and %i signatures\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Stored label: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "That is not a valid name, try again.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"This disc is called: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Copying package lists..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Writing new source list\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Source list entries for this disc are:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Unmounting CD-ROM..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: apt 0.6.42.3exp1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-08 00:23+0200\n"
"Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
msgid "Wrong CD-ROM"
msgstr "CD equivocado"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "No pude desmontar el CD-ROM de %s, tal vez todavía este en uso."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disco no encontrado."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fichero no encontrado"
msgid "Unable to accept connection"
msgstr "No pude aceptar la conexión"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Hay problemas enlazando fichero"
msgid "Read error from %s process"
msgstr "Error de lectura de %s procesos"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Esperando las cabeceras"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Obtuve una sola línea de cabecera arriba de %u caracteres"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Mala línea de cabecera"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "El servidor de http envió una cabecera de respuesta inválida"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "El servidor de http envió una cabecera de Content-Length inválida"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "El servidor de http envió una cabecera de Content-Range inválida"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Éste servidor de http tiene el soporte de alcance roto"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Formato de fecha desconocido"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Falló la selección"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Expiró la conexión"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Error escribiendo al archivo de salida"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Error escribiendo a archivo"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Error escribiendo al archivo"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Error leyendo del servidor, el lado remoto cerró la conexión."
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Error leyendo del servidor"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Mala cabecera Data"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Fallo la conexión"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Error interno"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Error de sintaxis %s:%u: Basura extra al final del archivo"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... ¡Error!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Hecho"
"El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para "
"éste."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Error, pkgProblemResolver::Resolve generó cortes, esto puede haber sido "
"causado por paquetes retenidos."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"No se pudieron corregir los problemas, usted ha retenido paquetes\n"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Descargando fichero %li de %li (falta %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Descargando fichero %li de %li"
msgid "You may want to run apt-get update to correct these problems"
msgstr "Tal vez quiera ejecutar 'apt-get update' para corregir estos problemas"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
"Registro inválido en el archivo de preferencias, no hay cabecera de paquete"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "No se entiende el pin tipo %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "No hay prioridad especificada para pin (o es cero)"
msgid "rename failed, %s (%s -> %s)."
msgstr "falló el cambio de nombre, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "La suma MD5 difiere"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"No existe ninguna clave pública disponible para los siguientes "
"identificadores de clave:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"No se pudo localizar un archivo para el paquete %s. Esto puede significar "
"que necesita arreglar manualmente este paquete."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
"Los archivos de índice de paquetes están corrompidos. El campo 'Filename:' "
"no existe para para el paquete %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "El tamaño difiere"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Se encontraron %i índices de paquetes, %i de fuentes y %i firmas\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Etiqueta guardada: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Ese no es un nombre válido, inténtelo de nuevo.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Este disco se llama: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Copiando las listas de paquetes..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Escribiendo nueva lista de fuente\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Las entradas de la lista de fuentes para este disco son:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Desmontando CD-ROM..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: apt_po_eu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:09+0200\n"
"PO-Revision-Date: 2006-09-27 13:59+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: librezale <librezale@librezale.org>\n"
msgid "Wrong CD-ROM"
msgstr "CD okerra"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
"Ezin izan da %s(e)ko CD-ROMa desmuntatu; beharbada erabiltzen ariko da."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Ez da diska aurkitu"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Ez da fitxategia aurkitu"
msgid "Unable to accept connection"
msgstr "Ezin da konexioa onartu"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Arazoa fitxategiaren hash egitean"
msgid "Read error from %s process"
msgstr "Irakurri errorea %s prozesutik"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Goiburuen zain"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Okerreko goiburu-lerroa"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "http zerbitzariak erantzun-buru baliogabe bat bidali du."
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "http zerbitzariak barruti onarpena apurturik du"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Datu-formatu ezezaguna"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Hautapenak huts egin du"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Konexioaren denbora-muga gainditu da"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Errorea irteerako fitxategian idaztean"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Errorea zerbitzaritik irakurtzean"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Goiburu data gaizki dago"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Konexioak huts egin du"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Barne-errorea"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Sintaxi-errorea, %s:%u: Zabor gehigarria fitxategi-amaieran"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Errorea!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Eginda"
msgstr ""
"%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada "
"atxikitako paketeek eraginda."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "%li fitxategia jasotzen %li-tik"
msgid "You may want to run apt-get update to correct these problems"
msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Erregistro baliogabea hobespenen fitxategian, pakete-goibururik ez"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Ez da ulertu %s orratz-mota (pin)"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)"
msgid "rename failed, %s (%s -> %s)."
msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum ez dator bat"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
-msgstr "Hurrengo gako ID hauentzat ez dago gako publiko eskuragarririk:\n"
+msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea. (arkitektura falta delako)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
"Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
"paketearentzat."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Tamaina ez dator bat"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "%i pakete indize, %i jatorri indize eta %i sinadura aurkitu dira\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, c-format
+msgid "Found label '%s'\n"
+msgstr "Aurkitutako Etiketa: '%s' \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Hau ez baliozko izen bat, froga berriro.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Diskaren izen:\n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Pakete zerrendak kopiatzen..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "jatorri zerrenda berria idazten\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Diskarentzako jaotrri sarrerak:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
-msgstr "CD-ROM Desmuntatzen..."
+#: apt-pkg/cdrom.cc:807
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD-ROM Desmuntatzen...\n"
#: apt-pkg/indexcopy.cc:261
#, c-format
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Konexioa behar baino lehenago itxi da"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Ezin izan zaio fixtategiari adabakia ezarri"
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-09-29 16:06+0300\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
msgid "Wrong CD-ROM"
msgstr "Väärä romppu"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Rompun %s irrottaminen ei onnistu, se on ehkä käytössä."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Levyä ei löydy"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Tiedostoa ei löydy"
msgid "Unable to accept connection"
msgstr "Yhteyttä ei voitu hyväksyä"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Pulmia tiedoston hajautuksessa"
msgid "Read error from %s process"
msgstr "Prosessi %s ilmoitti lukuvirheestä"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Odotetaan otsikoita"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Virheellinen otsikkorivi"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "HTTP-palvelimen arvoaluetuki on rikki"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Tuntematon päiväysmuoto"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Select ei toiminut"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Yhteys aikakatkaistiin"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Tapahtui virhe luettaessa palvelimelta"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Virheellinen otsikkotieto"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Yhteys ei toiminut"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Sisäinen virhe"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Virhe!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Valmis"
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei löydy."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt "
"paketit."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Noudetaan tiedosto %li / %li"
msgid "You may want to run apt-get update to correct these problems"
msgstr "Voit haluta suorittaa apt-get update näiden pulmien korjaamiseksi"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Asetustiedostossa on virheellinen tietue, Package-otsikko puuttuu"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Tunnistetyyppi %s on tuntematon"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)"
msgid "rename failed, %s (%s -> %s)."
msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum ei täsmää"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan "
"tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
"tämän paketin itse."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
"Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
"kenttää."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Koko ei täsmää"
"Asennuspakettien hakemistoja löytyi %i, lähdekoodipakettien hakemistoja %i "
"ja allekirjoituksia %i\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Tallennettu nimio: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Tuo ei kelpaa nimeksi, yritä uudelleen.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Tämä levy on: \n"
"\"%s\"\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopioidaan pakettiluetteloita..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Kirjoitetaan uusi lähdeluettelo\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Irrotetaan romppu..."
#: apt-pkg/indexcopy.cc:261
# French messages
#
# Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004.
-# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006.
+# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006, 2007.
msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
-"PO-Revision-Date: 2006-09-02 09:59+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
+"PO-Revision-Date: 2007-05-08 11:30+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"MIME-Version: 1.0\n"
#: cmdline/apt-cdrom.cc:78
msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-"Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »"
+msgstr "Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »"
#: cmdline/apt-cdrom.cc:93
msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-"Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée"
+msgstr "Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée"
#: cmdline/apt-cdrom.cc:117
msgid "Repeat this process for the rest of the CDs in your set."
#: cmdline/apt-extracttemplates.cc:310
msgid "Cannot get debconf version. Is debconf installed?"
-msgstr ""
-"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
+msgstr "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
msgid "Package extension list is too long"
#: ftparchive/apt-ftparchive.cc:835
#, c-format
msgid "Some files are missing in the package file group `%s'"
-msgstr ""
-"Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »"
+msgstr "Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »"
#: ftparchive/cachedb.cc:47
#, c-format
#: cmdline/apt-get.cc:764
msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-"Les paquets doivent être enlevés mais la désinstallation est désactivée."
+msgstr "Les paquets doivent être enlevés mais la désinstallation est désactivée."
#: cmdline/apt-get.cc:775
msgid "Internal error, Ordering didn't finish"
#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr ""
-"Après dépaquetage, %so d'espace disque supplémentaires seront utilisés.\n"
+msgstr "Après dépaquetage, %so d'espace disque supplémentaires seront utilisés.\n"
#: cmdline/apt-get.cc:832
#, c-format
#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
-msgstr ""
-"l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
+msgstr "l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
#: cmdline/apt-get.cc:1133
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
+msgstr "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
#: cmdline/apt-get.cc:1141
#, c-format
#: cmdline/apt-get.cc:1546
msgid "You might want to run `apt-get -f install' to correct these:"
-msgstr ""
-"Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :"
+msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :"
#: cmdline/apt-get.cc:1549
msgid ""
#: cmdline/apt-get.cc:2356
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
-msgstr ""
-"Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
+msgstr "Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
#: cmdline/apt-get.cc:2360
msgid "Failed to process build dependencies"
"seules les erreurs"
#: dselect/install:103
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
+msgid "above this message are important. Please fix them and run [I]nstall again"
msgstr ""
"précédant ce message sont importantes. Veuillez les corriger et\n"
"démarrer l'[I]nstallation une nouvelle fois."
#: apt-inst/deb/debfile.cc:52
#, c-format
msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr ""
-"Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s » ou « %s »"
+msgstr "Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s » ou « %s »"
#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Wrong CD-ROM"
msgstr "Mauvais cédérom"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
"Impossible de démonter le cédérom dans %s, il doit toujours être en cours "
"d'utilisation."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disque non trouvé."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fichier non trouvé"
#: methods/ftp.cc:265
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr ""
-"La commande « %s » du script de connexion a échoué, le serveur a répondu : %s"
+msgstr "La commande « %s » du script de connexion a échoué, le serveur a répondu : %s"
#: methods/ftp.cc:291
#, c-format
#: methods/ftp.cc:698
msgid "Could not connect data socket, connection timed out"
-msgstr ""
-"Impossible de se connecter sur le port de données, délai de connexion dépassé"
+msgstr "Impossible de se connecter sur le port de données, délai de connexion dépassé"
#: methods/ftp.cc:704
msgid "Could not connect passive socket."
msgid "Unable to accept connection"
msgstr "Impossible d'accepter une connexion"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problème de hachage du fichier"
#: methods/gpgv.cc:100
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon."
+msgstr "E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon."
#: methods/gpgv.cc:204
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
+msgid "Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erreur interne : signature correcte, mais il est impossible de déterminer "
"l'empreinte de la clé."
msgid "Read error from %s process"
msgstr "Erreur de lecture du processus %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Attente des fichiers d'en-tête"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "J'ai une simple ligne d'en-tête au-dessus du caractère %u"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Mauvaise ligne d'en-tête"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Le serveur http a envoyé une réponse dont l'en-tête est invalide"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Ce serveur http possède un support des limites non-valide"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Format de date inconnu"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Sélection défaillante"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Délai de connexion dépassé"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Erreur d'écriture du fichier de sortie"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Erreur d'écriture sur un fichier"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Erreur d'écriture sur le fichier"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Erreur de lecture du serveur"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Mauvais en-tête de donnée"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Échec de la connexion"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Erreur interne"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Erreur syntaxique %s:%u : valeur aberrante à la fin du fichier"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Erreur !"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Fait"
#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)"
+msgstr "Ligne %lu mal formée dans la liste des sources %s (distribution absolue)"
#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)"
+msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)"
#: apt-pkg/sourcelist.cc:203
#, c-format
#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
-"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
+msgstr "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
-msgstr ""
-"Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)"
+msgstr "Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)"
#: apt-pkg/packagemanager.cc:402
#, c-format
#: apt-pkg/algorithms.cc:241
#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"Le paquet %s doit être réinstallé, mais je ne parviens pas à trouver son "
"archive."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Erreur, pkgProblemResolver::Resolve a généré des ruptures, ce qui a pu être "
"causé par les paquets devant être gardés en l'état."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Impossible de corriger les problèmes, des paquets défecteux sont en mode "
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Téléchargement du fichier %li de %li (%s restant)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Téléchargement du fichier %li de %li"
#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-"Vous devez insérer quelques adresses « sources » dans votre sources.list"
+msgstr "Vous devez insérer quelques adresses « sources » dans votre sources.list"
#: apt-pkg/cachefile.cc:73
msgid "The package lists or status file could not be parsed or opened."
msgid "You may want to run apt-get update to correct these problems"
msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes."
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
"Enregistrement invalide dans votre fichier « préférences », aucune entrée "
"« Package »."
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Étiquette %s inconnue"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'étiquette"
#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Vous avez dépassé le nombre de versions que cet APT est capable de traiter."
+msgstr "Vous avez dépassé le nombre de versions que cet APT est capable de traiter."
#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
-msgstr ""
-"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
+msgstr "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "impossible de changer le nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Somme de contrôle MD5 incohérente"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
-msgstr ""
-"Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n"
+msgstr "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"sans doute que vous devrez corriger ce paquet manuellement (absence "
"d'architecture)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Je ne suis pas parvenu à localiser un fichier du paquet %s. Ceci signifie "
"que vous devrez corriger manuellement ce paquet."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
"pour le paquet %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Taille incohérente"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "%i index de paquets trouvés, %i index de sources et %i signatures\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, c-format
+msgid "Found label '%s'\n"
+msgstr "Étiquette « %s » trouvée\n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Ce nom n'est pas valable, veuillez recommencer.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Ce disque s'appelle :\n"
"« %s »\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Copie des listes de paquets..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Écriture de la nouvelle liste de sources\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Les entrées de listes de sources pour ce disque sont :\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
-msgstr "Démontage du cédérom..."
+#: apt-pkg/cdrom.cc:807
+msgid "Unmounting CD-ROM...\n"
+msgstr "Démontage du cédérom...\n"
#: apt-pkg/indexcopy.cc:261
#, c-format
msgid "Connection closed prematurely"
msgstr "Connexion fermée prématurément"
-#~ msgid "File date has changed %s"
-#~ msgstr "La date du fichier a changé %s"
-
-#~ msgid "Could not patch file"
-#~ msgstr "Impossible de modifier (« patch ») %s"
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-19 11:37+0100\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2007-02-28 13:14+0100\n"
"Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
"Language-Team: Galician <proxecto@trasno.net>\n"
msgid "Wrong CD-ROM"
msgstr "CD-ROM incorrecto"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Non se puido desmontar o CD-ROM de %s, pode estarse empregando aínda."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Non se atopou o disco"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Non se atopou o ficheiro"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "A obter o ficheiro %li de %li (fallan %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "A obter o ficheiro %li de %li"
msgid "You may want to run apt-get update to correct these problems"
msgstr "Pode querer executar apt-get update para corrixir estes problemas"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
"Rexistro non válido no ficheiro de preferencias, non hai unha cabeceira "
"Package"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Non se entendeu o tipo de inmobilización %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr ""
"Non se indicou unha prioridade (ou indicouse cero) para a inmobilización"
msgid "rename failed, %s (%s -> %s)."
msgstr "fallou o cambio de nome, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Os MD5Sum non coinciden"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man. (Falla a arquitectura)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
"Os ficheiros de índices de paquetes están corrompidos. Non hai un campo "
"Filename: para o paquete %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Os tamaños non coinciden"
msgstr ""
"Atopáronse %i índices de paquetes, %i índices de fontes e %i sinaturas\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Etiqueta armacenada: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Ese non é un nome válido, volva tentalo.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Este disco chámase: \n"
"\"%s\"\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "A copiar as listas de paquetes..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "A gravar a nova lista de fontes\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "As entradas da lista de fontes deste disco son:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "A desmontar o CD-ROM..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: apt 0.5.25\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2004-06-10 19:58+0300\n"
"Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
"Language-Team: Hebrew\n"
msgid "Wrong CD-ROM"
msgstr ""
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
#, fuzzy
msgid "Disk not found."
msgstr "(לא נמצא)"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr ""
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr ""
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr ""
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr ""
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, c-format
+msgid "Found label '%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr ""
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+msgid "Unmounting CD-ROM...\n"
msgstr ""
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-21 11:04+0100\n"
"Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
"Language-Team: Hungarian <debian-l10n-hungarian>\n"
msgid "Wrong CD-ROM"
msgstr "Hibás CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Nem lehet lecsatolni az itt lévő CD-ROM-ot: %s, talán még használod."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Nem találom a lemezt"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Nem találom a fájlt"
msgid "Unable to accept connection"
msgstr "Nem lehet elfogadni a kapcsolatot"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probléma a fájl hash értékének meghatározásakor"
msgid "Read error from %s process"
msgstr "Olvasási hiba %s folyamattól"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Várakozás a fejlécekre"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Egyetlen fejléc sort kaptam, ami több mint %u karakteres"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Rossz fejléc sor"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "A http kiszolgáló egy érvénytelen válaszfejlécet küldött"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "A http kiszolgáló egy érvénytelen Content-Length fejlécet küldött"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "A http kiszolgáló egy érvénytelen Content-Range fejlécet küldött"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Ez a http szerver támogatja a sérült tartományokat "
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Ismeretlen dátum formátum"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Sikertelen kiválasztás"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Időtúllépés a kapcsolatban"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Hiba a kimeneti fájl írásakor"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Hiba fájl írásakor"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Hiba a fájl írásakor"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Hiba a kiszolgálóról olvasáskor"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Rossz fejlécadat"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Sikertelen kapcsolódás"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Belső hiba"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Szintaktikai hiba %s: %u: fölösleges szemét a fájl végén"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Hiba!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Kész"
msgstr ""
"A(z) %s csomagot újra kell telepíteni, de nem találok archívumot hozzá."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott "
"csomagok okozhatják."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"A problémák nem javíthatók, sérült visszafogott csomagok vannak a rendszeren."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "%li/%li fájl letöltése (%s marad)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "%li/%li fájl letöltése"
msgid "You may want to run apt-get update to correct these problems"
msgstr "Próbáld futtatni az apt-get update -et, hogy javítsd e hibákat"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Hibás rekord a tulajdonság fájlban, nincs csomagfejléc"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "A(z) %s tűtípus nem értelmezhető"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Nincs prioritás (vagy nulla) megadva a tűhöz"
msgid "rename failed, %s (%s -> %s)."
msgstr "sikertelen átnevezés, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Az MD5Sum nem megfelelő"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot. (hiányzó arch. miatt)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "A méret nem megfelelő"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "%i csomagindexet, %i forrásindexet és %i aláírást találtam\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Tárolt címke: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "E név érvénytelen, próbáld újra.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"E lemez neve: \n"
"%s\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Csomaglisták másolása..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Új forráslista írása\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "E lemezhez tartozó forráslista-bejegyzések a következők:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "CD-ROM leválasztása..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-12 09:27+0200\n"
"Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n"
"Language-Team: Italian <it@li.org>\n"
msgid "Wrong CD-ROM"
msgstr "CD-ROM sbagliato"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Impossibile smontare il CD-ROM in %s, potrebbe essere ancora in uso."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disco non trovato"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "File non trovato"
msgid "Unable to accept connection"
msgstr "Impossibile accettare connessioni"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problemi nella creazione dell'hash del file"
msgid "Read error from %s process"
msgstr "Errore di lettura dal processo %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "In attesa degli header"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Si è ottenuto una singola linea di header su %u caratteri"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Linea nell'header non corretta"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Il server HTTP ha inviato un header di risposta non valido"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Il server HTTP ha inviato un Content-Length non valido"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Il server HTTP ha inviato un Content-Range non valido"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Questo server HTTP ha il supporto del range bacato"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Formato della data sconosciuto"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Select fallito"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Tempo limite per la connessione esaurito"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Errore nella scrittura del file di output"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Errore nella scrittura nel file"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Errore nella scrittura nel file"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Errore nella lettura dal server. Il lato remoto ha chiuso la connessione"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Errore nella lettura dal server"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Header dei dati malformato"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Connessione fallita"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Errore interno"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Errore di sintassi %s:%u: caratteri extra alla fine del file"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Errore!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Fatto"
"Il pacchetto %s deve essere reinstallato, ma non si riesce a trovare un "
"archivio per esso."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Errore, pkgProblemResolver::Resolve ha generato uno stop, questo può essere "
"causato da pacchetti bloccati "
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Impossibile correggere i problemi, ci sono pacchetti rotti bloccati"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Scaricamento file %li di %li (%s rimanente)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Scaricamento file %li di %li"
msgid "You may want to run apt-get update to correct these problems"
msgstr "È consigliabile eseguire apt-get update per correggere questi problemi"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Campo non valido nel file delle preferenze, Manca \"Package header\""
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Impossibile capire il tipo di pin %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Nessuna (o zero) priorità specificata per il pin"
msgid "rename failed, %s (%s -> %s)."
msgstr "rename() fallita: %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Somma MD5 non corrispondente"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Non esiste una chiave pubblica disponibile per i seguenti ID di chiave:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"che bisogna correggere manualmente l'errore. (a causa di un'architettura "
"mancante)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Non è stato possibile trovare file per il pacchetto %s. Questo significa che "
"bisogna correggere manualmente l'errore."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
"I file indice dei pacchetti sono corrotti. Non c'è un campo Filename: per il "
"pacchetto %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Le Dimensioni non corrispondono"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Trovati %i indici di pacchetto, %i indici di sorgenti e %i firme\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Etichette salvate: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Questo non è un nome valido, riprovare.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Questo disco è chiamato: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Copia della lista dei pacchetti in corso..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Scrittura di una nuova lista sorgenti in corso\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Le voci lista sorgenti per questo Disco sono:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Smontaggio CD-ROM in corso..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-09-08 19:57+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
msgid "Wrong CD-ROM"
msgstr "CD が違います"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "%s の CD-ROM は使用中のためアンマウントすることができません。"
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "ディスクが見つかりません。"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "ファイルが見つかりません"
msgid "Unable to accept connection"
msgstr "接続を accept できません"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "ファイルのハッシュでの問題"
msgid "Read error from %s process"
msgstr "%s プロセスからの読み込みエラー"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "ヘッダの待機中です"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "%u 文字を超える 1 行のヘッダを取得しました"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "不正なヘッダ行です"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "http サーバが不正なリプライヘッダを送信してきました"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http サーバが不正な Content-Length ヘッダを送信してきました"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http サーバが不正な Content-Range ヘッダを送信してきました"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "http サーバのレンジサポートが壊れています"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "不明な日付フォーマットです"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "select に失敗しました"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "接続タイムアウト"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "出力ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "サーバからの読み込みに失敗しました"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "不正なヘッダです"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "接続失敗"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "内部エラー"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... エラー!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... 完了"
"パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見"
"つけることができませんでした。"
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー"
"ジが原因です。"
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "ファイルを取得しています %li/%li (残り %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "ファイルを取得しています %li/%li"
"これらの問題を解決するためには apt-get update を実行する必要があるかもしれま"
"せん"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
"不正なレコードが preferences ファイルに存在します。パッケージヘッダがありませ"
"ん"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "pin タイプ %s が理解できませんでした"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "pin で優先度 (または 0) が指定されていません"
msgid "rename failed, %s (%s -> %s)."
msgstr "名前の変更に失敗しました。%s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum が適合しません"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります (存在しないアーキテクチャのため)。"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります。"
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
"パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
"フィールドがありません。"
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "サイズが適合しません"
"%i のパッケージインデックス、%i のソースインデックス、%i の署名を見つけまし"
"た\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "格納されたラベル: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "これは有効な名前ではありません。再試行してください。\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"このディスクは以下のように呼ばれます: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "パッケージリストをコピーしています ..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "新しいソースリストを書き込んでいます\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "このディスクのソースリストのエントリ:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "CD-ROM をアンマウントしています ..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-12 21:22-0400\n"
"Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
msgid "Wrong CD-ROM"
msgstr "잘못된 CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "%s 안의 CD-ROM을 마운트 해제할 수 없습니다. 사용 중일 것입니다."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "디스크가 없습니다."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "파일이 없습니다"
msgid "Unable to accept connection"
msgstr "연결을 받을 수 없습니다"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "파일 해싱에 문제가 있습니다"
msgid "Read error from %s process"
msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "헤더를 기다리는 중입니다"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "헤더 줄이 잘못되었습니다"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "데이터 형식을 알 수 없습니다"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "select가 실패했습니다"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "연결 시간이 초과했습니다"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "출력 파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "해당 파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "서버에서 읽는 데 오류가 발생했습니다"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "헤더 데이터가 잘못되었습니다"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "연결이 실패했습니다"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "내부 오류"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... 오류!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... 완료"
msgstr ""
"%s 꾸러미를 다시 설치해야 하지만, 이 꾸러미의 아카이브를 찾을 수 없습니다."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"오류, pkgProblemResolver::Resolve가 망가졌습니다, 고정 꾸러미때문에 발생할 수"
"도 있습니다."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "문제를 바로잡을 수 없습니다, 망가진 고정 꾸러미가 있습니다."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "파일 받아오는 중: %2$li 중 %1$li (%3$s 남았음)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "파일 받아오는 중: %2$li 중 %1$li"
msgid "You may want to run apt-get update to correct these problems"
msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습니다."
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "기본 설정 파일에 잘못된 데이터가 있습니다. 꾸러미 헤더가 없습니다"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "핀 타입 %s이(가0 무엇인지 이해할 수 없습니다"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다"
msgid "rename failed, %s (%s -> %s)."
msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum이 맞지 않습니다"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "다음 키 ID의 공개키가 없습니다:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다. (아키텍쳐가 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "크기가 맞지 않습니다"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "꾸러미 색인 %i개, 소스 색인 %i개, 시그너처 %i개 발견\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "저장된 레이블: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "올바른 이름이 아닙니다. 다시 시도하십시오.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"이 디스크는 다음과 같습니다: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "꾸러미 목록을 복사하는 중입니다..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "새 소스 리스트를 쓰는 중입니다\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "CD-ROM을 마운트 해제하는 중입니다..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-16 00:35+0100\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n"
msgid "Wrong CD-ROM"
msgstr "Feil CD-plate"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
"Klarer ikke å avmontere CD-plata i %s. Det kan hende plata fremdeles er i "
"bruk."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disk ikke funnet."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fant ikke fila"
msgid "Unable to accept connection"
msgstr "Klarte ikke å godta tilkoblingen"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nøkkel for fil"
msgid "Read error from %s process"
msgstr "Lesefeil fra %s-prosessen"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Venter på hoder"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fikk en enkel hodelinje over %u tegn"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Ødelagt hodelinje"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-tjeneren sendte et ugyldig svarhode"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-tjeneren sendte et ugyldig «Content-Length»-hode"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-tjeneren sendte et ugyldig «Content-Range»-hode"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tjeneren har ødelagt støtte for område"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Ukjent datoformat"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Utvalget mislykkes"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Tidsavbrudd på forbindelsen"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Feil ved lesing fra tjeneren"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Ødelagte hodedata"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Forbindelsen mislykkes"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Intern feil"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaksfeil %s:%u: Ugyldige angivelser på slutten av fila"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s ... Feil"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s ... Ferdig"
msgstr ""
"Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker "
"som holdes tilbake."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Henter fil %li av %li (%s gjenværende)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Henter fil %li av %li"
msgstr ""
"Det kan hende du vil kjøre «apt-get update» for å rette på disse problemene"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Ugyldig oppslag i foretrekksfila, manglende pakkehode"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Forsto ikke spikring av typen %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller null) spesifisert for pin"
msgid "rename failed, %s (%s -> %s)."
msgstr "klarte ikke å endre navnet, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Feil MD5sum"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken "
"selv (fordi arkitekturen mangler)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne denne "
"pakken selv."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Oversiktsfilene er ødelagte. Feltet «Filename:» mangler for pakken %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Feil størrelse"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Fant %i pakkeindekser, %i kildeindekser og %i signaturer\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Lagret merkelapp: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Det er ikke et gyldig navn, prøv igjen.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"CD-en er kalt: \n"
"«%s»\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopierer pakkelister..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Skriver ny kildeliste\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Kildelisteoppføringer for denne CD-en er:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Avmonterer CD-ROM..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-17 22:35+0100\n"
"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
msgid "Wrong CD-ROM"
msgstr "Verkeerde CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
"Kan de CD-ROM in %s niet loskoppelen, mogelijk wordt die nog steeds gebruikt."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Schijf niet gevonden"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Bestand niet gevonden"
msgid "Unable to accept connection"
msgstr "Kan de verbinding niet aanvaarden"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probleem bij het hashen van het bestand"
msgid "Read error from %s process"
msgstr "Leesfout door proces %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Wachtend op de kopteksten"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Foute koptekstregel"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
"Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
"Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Onbekend datumformaat"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Selectie is mislukt"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Verbinding verliep"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Fout bij het schrijven naar het uitvoerbestand"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Fout bij het schrijven naar bestand"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Fout bij het schrijven naar het bestand"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Fout bij het lezen van de server, andere kant heeft de verbinding gesloten"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Fout bij het lezen van de server"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Foute koptekstdata"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Verbinding mislukt"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Interne fout"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaxfout %s:%u: Extra rommel aan het einde van het bestand"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Fout!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Klaar"
"Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor "
"gevonden worden."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan "
"veroorzaakt worden door vastgehouden pakketten."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Bestand %li van %li wordt opgehaald (nog %s te gaan)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Bestand %li van %li wordt opgehaald"
msgstr ""
"U kunt misschien 'apt-get update' uitvoeren om deze problemen te verhelpen"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Ongeldige record in het voorkeurenbestand, geen 'Package'-koptekst"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Pintype %s wordt niet begrepen"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin"
msgid "rename failed, %s (%s -> %s)."
msgstr "hernoeming is mislukt, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum komt niet overeen"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren (wegens missende architectuur)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
"pakket %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Grootte komt niet overeen"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "%i pakket-indexen gevonden, %i bron-indexen en %i handtekeningen\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Opgeslagen label: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Dat is een ongeldige naam, gelieve opnieuw te proberen.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"De schijf heet:\n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Pakketlijsten worden gekopieerd..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Nieuwe bronlijst wordt weggeschreven\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Bronlijst-ingangen voor de schijf zijn:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "CD wordt afgekoppeld..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: apt_nn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
msgid "Wrong CD-ROM"
msgstr "Feil CD-plate"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
"Klarte ikkje montera CD-plata i %s. Det kan henda plata framleis er i bruk."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
#, fuzzy
msgid "Disk not found."
msgstr "Fann ikkje fila"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fann ikkje fila"
msgid "Unable to accept connection"
msgstr "Klarte ikkje godta tilkoplinga"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nøkkel for fil"
msgid "Read error from %s process"
msgstr "Lesefeil frå %s-prosessen"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Ventar på hovud"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fekk ei enkel hovudlinje over %u teikn"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Øydelagd hovudlinje"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-tenaren sende eit ugyldig svarhovud"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-tenaren sende eit ugyldig «Content-Length»-hovud"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-tenaren sende eit ugyldig «Content-Range»-hovud"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tenaren har øydelagd støtte for område"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Ukjend datoformat"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Utvalet mislukkast"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Tidsavbrot på sambandet"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing frå tenaren. Sambandet vart lukka i andre enden"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Feil ved lesing frå tenaren"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Øydelagde hovuddata"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Sambandet mislukkast"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Intern feil"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s ... Feil"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s ... Ferdig"
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Pakken %s må installerast på nytt, men arkivet finst ikkje."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Feil, «pkgProblemResolver::Resolve» har laga brot. Dette kan skuldast pakkar "
"som er haldne tilbake."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Klarte ikkje retta opp problema. Nokre øydelagde pakkar er haldne tilbake."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Les filliste"
msgstr ""
"Du vil kanskje prøva å retta på desse problema ved å køyra «apt-get update»."
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Skjønar ikkje spikringstypen %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller null) oppgitt for spiker"
msgid "rename failed, %s (%s -> %s)."
msgstr "endring av namn mislukkast, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Feil MD5-sum"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv "
"(fordi arkitekturen manglar)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Pakkeindeksfilene er øydelagde. Feltet «Filename:» manglar for pakken %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Feil storleik"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Lagra etikett: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Det er ikkje eit gyldig namn, prøv igjen.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Disken vert kalla: \n"
"«%s»\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopierer pakkelister ..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Skriv ny kjeldeliste\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Kjeldelisteoppføringar for denne disken er:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Avmonterer CD-ROM ..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-01-23 15:32+0100\n"
"Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
"Language-Team: Polish <pddp@debian.linux.org.pl>\n"
msgid "Wrong CD-ROM"
msgstr "Niew³a¶ciwa p³yta CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Nie uda³o siê odmontowaæ CD-ROM-u w %s, byæ mo¿e wci±¿ jest u¿ywany."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Nie odnaleziono dysku."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Nie odnaleziono pliku"
msgid "Unable to accept connection"
msgstr "Nie uda³o siê przyj±æ po³±czenia"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Nie uda³o siê obliczyæ skrótu pliku"
msgid "Read error from %s process"
msgstr "B³±d odczytu z procesu %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Oczekiwanie na nag³ówki"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Otrzymano pojedyncz± liniê nag³ówka o d³ugo¶ci ponad %u znaków"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Nieprawid³owa linia nag³ówka"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Serwer HTTP przys³a³ nieprawid³owy nag³ówek odpowiedzi"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Serwer HTTP przys³a³ nieprawid³owy nag³ówek Content-Length"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Serwer HTTP przys³a³ nieprawid³owy nag³ówek Content-Range"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Ten serwer HTTP nieprawid³owo obs³uguje zakresy (ranges)"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Nieznany format daty"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Operacja select nie powiod³a siê"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Przekroczenie czasu po³±czenia"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "B³±d przy pisaniu do pliku wyj¶ciowego"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "B³±d przy pisaniu do pliku"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "B³±d przy pisaniu do pliku"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "B³±d czytania z serwera: Zdalna strona zamknê³a po³±czenie"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "B³±d czytania z serwera"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "B³êdne dane nag³ówka"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Po³±czenie nie uda³o siê"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "B³±d wewnêtrzny"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "B³±d sk³adniowy %s:%u: ¦mieci na koñcu pliku"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... B³±d!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Gotowe"
msgstr ""
"Pakiet %s ma zostaæ przeinstalowany, ale nie mo¿na znale¼æ jego archiwum."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"B³±d, pkgProblemResolver::Resolve zwróci³ b³±d, mo¿e to byæ spowodowane "
"\"zatrzymanymi\" pakietami."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nie uda³o siê naprawiæ problemów, zatrzymano uszkodzone pakiety."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, fuzzy, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Pobieranie pliku %li z %li (%s pozosta³o)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Czytanie listy plików"
msgid "You may want to run apt-get update to correct these problems"
msgstr "Nale¿y uruchomiæ apt-get update aby naprawiæ te problemy."
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Nieprawid³owy rekord w pliku ustawieñ, brak nag³ówka Package"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Nierozpoznany typ przypinania %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Brak (lub zerowy) priorytet przypiêcia"
msgid "rename failed, %s (%s -> %s)."
msgstr "nie uda³o siê zmieniæ nazwy, %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "B³êdna suma MD5"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
#, fuzzy
msgid "There is no public key available for the following key IDs:\n"
msgstr "Dla nastêpuj±cego identyfikatora klucza brakuje klucza publicznego:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"Nie uda³o siê odnale¼æ pliku dla pakietu %s. Mo¿e to oznaczaæ, ¿e trzeba "
"bêdzie rêcznie naprawiæ ten pakiet (z powodu brakuj±cej architektury)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Nie uda³o siê odnale¼æ pliku dla pakietu %s. Mo¿e to oznaczaæ, ¿e trzeba "
"bêdzie rêcznie naprawiæ ten pakiet."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Pliki indeksu pakietów s± uszkodzone. Brak pola Filename: dla pakietu %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "B³êdny rozmiar"
"Znaleziono %i indeksów pakietów, %i indeksów ¼ród³owych, %i indeksów "
"t³umaczeñ i %i sygnatur\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Etykieta: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "To nie jest prawid³owa nazwa, spróbuj ponownie.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"P³yta nosi nazwê: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopiowanie list pakietów..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Zapisywanie nowej listy ¼róde³\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "¬ród³a dla tej p³yty to:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Odmontowanie CD-ROMu..."
#: apt-pkg/indexcopy.cc:261
# Debian-PT translation for apt.
# Copyright (C) 2004 Free Software Foundation, Inc.
-# Miguel Figueiredo <elmig@debianpt.org>, 2005, 2006.
+# Miguel Figueiredo <elmig@debianpt.org>, 2005, 2006, 2007.
#
#
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
-"PO-Revision-Date: 2006-10-14 21:55+0100\n"
-"Last-Translator: Rui Az. <astronomy@mail.pt>\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
+"PO-Revision-Date: 2007-05-09 22:14+0100\n"
+"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
msgid "Wrong CD-ROM"
msgstr "CD errado"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disco não encontrado"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Arquivo não encontrado"
msgid "Unable to accept connection"
msgstr "Impossível aceitar ligação"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema fazendo o hash do ficheiro"
msgid "Read error from %s process"
msgstr "Erro de leitura do processo %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Aguardando por cabeçalhos"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Linha de cabeçalho errada"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor http enviou um cabeçalho de resposta inválido"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor http enviou um cabeçalho Conten-Length inválido"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor http enviou um cabeçalho Conten-Range inválido"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Este servidor http possui suporte a range errado"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Select falhou."
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "A ligação expirou"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Erro gravando para ficheiro de saída"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Erro gravando para ficheiro"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Erro gravando para o ficheiro"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor. O Remoto fechou a ligação"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Dados de cabeçalho errados"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Falhou a ligação"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Erro interno"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Erro de sintaxe %s:%u: Lixo extra no final do ficheiro"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Erro !"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Pronto"
"O pacote %s precisa ser reinstalado, mas não foi possível encontrar um "
"repositório para o mesmo."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
"pacotes mantidos (hold)."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Impossível corrigir problemas, você manteve (hold) pacotes estragados."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "A obter o ficheiro %li de %li (%s restantes)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "A obter o ficheiro %li·of·%li"
msgid "You may want to run apt-get update to correct these problems"
msgstr "Você terá que executar apt-get update para corrigir estes problemas"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Registro inválido no ficheiro de preferências, sem cabeçalho Pacote"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Não foi possível entender o tipo de marca %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Nenhuma prioridade (ou zero) especificada para marcação"
msgid "rename failed, %s (%s -> %s)."
msgstr "falhou renomear, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Não existe qualquer chave pública disponível para as seguintes IDs de "
"chave:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"que você precisa consertar manualmente este pacote. (devido a arquitectura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
"que você precisa consertar manualmente este pacote."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Tamanho incorrecto"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Encontrou %i indexes de pacotes, %indexes de source e %i assinaturas\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, c-format
+msgid "Found label '%s'\n"
+msgstr "Encontrada etiqueta '%s'\n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Isso não é um nome válido, tente de novo.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Este Disco tem o nome: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "A copiar listas de pacotes..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "A escrever lista de novas source\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "As entradas de listas de Source para este Disco são:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
-msgstr "A desmontar o CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+msgid "Unmounting CD-ROM...\n"
+msgstr "A desmontar o CD-ROM...\n"
#: apt-pkg/indexcopy.cc:261
#, c-format
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-08-21 00:40-0300\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@cathedrallabs.org>\n"
"Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
msgid "Wrong CD-ROM"
msgstr "CD-ROM errado"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disco não encontrado."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Arquivo não encontrado"
msgid "Unable to accept connection"
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:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema fazendo o hash do arquivo"
msgid "Read error from %s process"
msgstr "Erro de leitura do processo %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Aguardando por cabeçalhos"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Linha de cabeçalho ruim"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor HTTP enviou um cabeçalho Content-Length inválido"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor HTTP enviou um cabeçalho Content-Range inválido"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Este servidor HTTP possui suporte a range quebrado"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Seleção falhou"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Conexão expirou"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Erro gravando para arquivo de saída"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Erro gravando para arquivo"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Erro gravando para o arquivo"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Dados de cabeçalho ruins"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Conexão falhou"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Erro interno"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Erro de sintaxe %s:%u: Lixo extra no final do arquivo"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Erro!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Pronto"
"O pacote %s precisa ser reinstalado, mas não foi possível encontrar um "
"arquivo para o mesmo."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
"pacotes mantidos (hold)."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Obtendo o arquivo %li de %li (%s restantes)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Obtendo arquivo %li de %li"
msgid "You may want to run apt-get update to correct these problems"
msgstr "Você terá que executar apt-get update para corrigir esses problemas"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Registro inválido no arquivo de preferências, sem cabeçalho Package"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Não foi possível entender o tipo de pin %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Nenhuma prioridade (ou zero) especificada para pin"
msgid "rename failed, %s (%s -> %s)."
msgstr "renomeação falhou, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"que você precisa consertar manualmente este pacote. (devido a arquitetura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
"que você precisa consertar manualmente este pacote."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Tamanho incorreto"
"Encontrado(s) %i índice(s) de pacote(s), %i índice(s) de fonte(s) e %i "
"assinaturas\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Rótulo armazenado: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Este não é um nome válido, tente novamente.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Esse disco é chamado: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Copiando lista de pacotes..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Gravando nova lista de fontes\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Entradas na lista de fontes para este disco são:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Desmontando CD-ROM..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: apt_po_ro\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-09-19 01:35+0300\n"
"Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
msgid "Wrong CD-ROM"
msgstr "CD-ROM necorespunzător"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Nu pot demonta CDROM-ul în %s, poate este încă utilizat."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disc negăsit."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fişier negăsit"
msgid "Unable to accept connection"
msgstr "Nu pot accepta conexiune"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problemă la indexarea fişierului"
msgid "Read error from %s process"
msgstr "Eroare de citire din procesul %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "În aşteptarea antetelor"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Primit o singură linie de antet peste %u caractere"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Linie de antet necorespunzătoare"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Serverul http a trimis un antet de răspuns necorespunzător"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Serverul http a trimis un antet lungime-conţinut necorespunzător"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Serverul http a trimis un antet zonă de conţinut necorespunzător"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Acest server http are zonă de suport necorespunzătoare"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Format de date necunoscut"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Eşuarea selecţiei"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Timp de conectare expirat"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Eroare la scrierea fişierului de rezultat"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Eroare la scrierea în fişier"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Eroare la scrierea în fişierul"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Eroare la citirea de pe server"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Antet de date necorespunzător"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Conectare eşuată"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Eroare internă"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare la sfârşitul fişierului"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Eroare!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Terminat"
msgstr ""
"Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi "
"cauzată de pachete ţinute."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nu pot corecta problema, aţi ţinut pachete deteriorate."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Se descarcă fişierul %li din %li (%s rămas)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Se descarcă fişierul %li din %li"
msgstr ""
"Aţi putea vrea să porniţi 'apt-get update' pentru a corecta aceste probleme."
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Înregistrare invalidă în fişierul de preferinţe, fără antet de pachet"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Nu s-a înţeles tipul de pin %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Fără prioritate (sau zero) specificată pentru pin"
msgid "rename failed, %s (%s -> %s)."
msgstr "redenumire eşuată, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Nepotrivire MD5Sum"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Nu există nici o cheie publică disponibilă pentru următoarele "
"identificatoare de chei:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna "
"că aveţi nevoie să reparaţi manual acest pachet (din pricina unui arch lipsă)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna "
"că aveţi nevoie să depanaţi manual acest pachet."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
"Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la "
"pachetul %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Nepotrivire dimensiune"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Găsite %i indexuri de pachete, %i indexuri de surse şi %i semnături\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Etichetă memorată: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Acesta nu este un nume valid, mai încercaţi.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Acest disc este numit: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Copiez listele de pachete.."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Scriere noua listă sursă\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Intrările listei surselor pentru acest disc sunt:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Demontez CD-ROM..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: 0.6.46.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-04 17:45+0000\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2007-01-03 23:33+0300\n"
"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"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
#: ftparchive/apt-ftparchive.cc:371
msgid "Error writing header to contents file"
-msgstr "Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)"
+msgstr ""
+"Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)"
#: ftparchive/apt-ftparchive.cc:401
#, c-format
"DB format is invalid. If you upgraded from a older version of apt, please "
"remove and re-create the database."
msgstr ""
-"Некорректный формат базы данных (DB). Если вы обновляли версию apt, "
-"удалите и создайте базу данных заново."
+"Некорректный формат базы данных (DB). Если вы обновляли версию apt, удалите "
+"и создайте базу данных заново."
#: ftparchive/cachedb.cc:81
#, c-format
#: ftparchive/multicompress.cc:105
#, c-format
msgid "Compressed output %s needs a compression set"
-msgstr "Для получения сжатого вывода %s необходимо включить использования сжатия"
+msgstr ""
+"Для получения сжатого вывода %s необходимо включить использования сжатия"
#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
msgid "Failed to create IPC pipe to subprocess"
#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
-msgstr "Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
+msgstr ""
+"Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
#: cmdline/apt-get.cc:538
#, c-format
#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr "После распаковки объем занятого дискового пространства возрастёт на %sB.\n"
+msgstr ""
+"После распаковки объем занятого дискового пространства возрастёт на %sB.\n"
#: cmdline/apt-get.cc:832
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
-msgstr "После распаковки объем занятого дискового пространства уменьшится на %sB.\n"
+msgstr ""
+"После распаковки объем занятого дискового пространства уменьшится на %sB.\n"
#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
#, c-format
#: cmdline/apt-get.cc:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Пропускается %s - пакет уже установлен, и опция upgrade не установлена.\n"
+msgstr ""
+"Пропускается %s - пакет уже установлен, и опция upgrade не установлена.\n"
#: cmdline/apt-get.cc:1058
#, c-format
#: dselect/install:102
msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "возникновению новых из-за неудовлетворённых зависимостей. Это нормально,"
+msgstr ""
+"возникновению новых из-за неудовлетворённых зависимостей. Это нормально,"
#: dselect/install:103
-msgid "above this message are important. Please fix them and run [I]nstall again"
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
"важны только ошибки, указанные выше. Исправьте их и выполните установку ещё "
"раз"
"then make it empty and immediately re-install the same version of the "
"package!"
msgstr ""
-"Не удалось открыть список файлов '%sinfo/%s'. Если вы не сможете восстановить "
-"этот файл, то обнулите его и немедленно переустановите ту же версию пакета!"
+"Не удалось открыть список файлов '%sinfo/%s'. Если вы не сможете "
+"восстановить этот файл, то обнулите его и немедленно переустановите ту же "
+"версию пакета!"
#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
#, c-format
msgid "Wrong CD-ROM"
msgstr "Ошибочный CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Невозможно размонтировать CD-ROM в %s, возможно он ещё используется."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Диск не найден."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Файл не найден"
#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
-#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243
+#: methods/gzip.cc:150
msgid "Failed to stat"
msgstr "Не удалось получить атрибуты"
#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
-#: methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Не удалось установить время модификации"
msgid "Unable to accept connection"
msgstr "Невозможно принять соединение"
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Проблема при хешировании файла"
#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
-msgstr "Что-то странное произошло при попытке получить IP адрес для '%s:%s' (%i)"
+msgstr ""
+"Что-то странное произошло при попытке получить IP адрес для '%s:%s' (%i)"
#: methods/connect.cc:223
#, c-format
"работы."
#: methods/gpgv.cc:204
-msgid "Internal error: Good signature, but could not determine key fingerprint?!"
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток "
"ключа?!"
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
-msgstr "Следующие подписи не могут быть проверены, так как недоступен общий ключ:\n"
+msgstr ""
+"Следующие подписи не могут быть проверены, так как недоступен общий ключ:\n"
#: methods/gzip.cc:64
#, c-format
msgid "Read error from %s process"
msgstr "Ошибка чтения из процесса %s"
-#: methods/http.cc:375
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Ожидание заголовков"
-#: methods/http.cc:521
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Получен заголовок длиннее %u символов"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Неверный заголовок"
-#: methods/http.cc:548 methods/http.cc:555
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Http-сервер послал неверный заголовок"
-#: methods/http.cc:584
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http сервер послал неверный заголовок Content-Length"
-#: methods/http.cc:599
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http-сервер послал неверный заголовок Content-Range"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов"
-#: methods/http.cc:625
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Неизвестный формат данных"
-#: methods/http.cc:772
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Ошибка в select"
-#: methods/http.cc:777
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Время ожидания для соединения истекло"
-#: methods/http.cc:800
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Ошибка записи в выходной файл"
-#: methods/http.cc:831
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Ошибка записи в файл"
-#: methods/http.cc:859
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Ошибка записи в файл"
-#: methods/http.cc:873
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Ошибка чтения, удалённый сервер прервал соединение"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Ошибка чтения с сервера"
-#: methods/http.cc:1106
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Неверный заголовок данных"
-#: methods/http.cc:1123
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Соединение разорвано"
-#: methods/http.cc:1214
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Внутренняя ошибка"
#: apt-pkg/contrib/fileutl.cc:387
#, c-format
msgid "Sub-process %s received a segmentation fault."
-msgstr "Нарушение защиты памяти (segmentation fault) в порождённом процессе %s."
+msgstr ""
+"Нарушение защиты памяти (segmentation fault) в порождённом процессе %s."
#: apt-pkg/contrib/fileutl.cc:390
#, c-format
#: apt-pkg/contrib/fileutl.cc:492
#, c-format
msgid "read, still have %lu to read but none left"
-msgstr "ошибка при чтении. собирались прочесть ещё %lu байт, но ничего больше нет"
+msgstr ""
+"ошибка при чтении. собирались прочесть ещё %lu байт, но ничего больше нет"
#: apt-pkg/contrib/fileutl.cc:522
#, c-format
#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)"
+msgstr ""
+"Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)"
#: apt-pkg/sourcelist.cc:99
#, c-format
#: apt-pkg/algorithms.cc:241
#, c-format
-msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "Пакет %s нуждается в переустановке, но найти архив для него не удалось."
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Пакет %s нуждается в переустановке, но найти архив для него не удалось."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это "
"может быть вызвано отложенными (held) пакетами."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Загружается файл %li из %li (%s осталось)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Загружается файл %li из %li"
msgid "You may want to run apt-get update to correct these problems"
msgstr "Вы можете запустить 'apt-get update' для исправления этих ошибок"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Неверная запись в файле preferences: отсутствует заголовок Package"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Неизвестный тип фиксации %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Для фиксации не указан приоритет (или указан нулевой)"
msgid "IO Error saving source cache"
msgstr "Ошибка ввода/вывода при попытке сохранить кеш исходных текстов"
-#: apt-pkg/acquire-item.cc:130
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "переименовать не удалось, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660
-#: apt-pkg/acquire-item.cc:1375
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum не совпадает"
-#: apt-pkg/acquire-item.cc:1070
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "Недоступен общий ключ для следующих ID ключей:\n"
-#: apt-pkg/acquire-item.cc:1183
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-"Не удалось обнаружить файл пакета %s. Это может означать, что вам "
-"пÑ\80идÑ\91Ñ\82Ñ\81Ñ\8f вÑ\80Ñ\83Ñ\87нÑ\83Ñ\8e иÑ\81пÑ\80авиÑ\82Ñ\8c Ñ\8dÑ\82оÑ\82 пакеÑ\82 (возможно, пÑ\80опÑ\83Ñ\89ен arch)"
+"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
+"вручную исправить этот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:1242
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-"Не удалось обнаружить файл пакета %s. Это может означать, что вам "
-"пÑ\80идÑ\91Ñ\82Ñ\81Ñ\8f вÑ\80Ñ\83Ñ\87нÑ\83Ñ\8e иÑ\81пÑ\80авиÑ\82Ñ\8c Ñ\8dÑ\82оÑ\82 пакеÑ\82."
+"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
+"вручную исправить этот пакет."
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:855
#, c-format
-msgid "The package index files are corrupted. No Filename: field for package %s."
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
-#: apt-pkg/acquire-item.cc:1365
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Не совпадает размер"
"Найдено индексов: %i для пакетов, %i для пакетов c исходными текстами\n"
"и %i для сигнатур\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Найдена метка: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Это неправильное имя, попробуйте ещё раз.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Название диска: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Копирование списков пакетов..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Запись нового списка источников\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Записи в списке источников для этого диска:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Размонтирование CD-ROM..."
#: apt-pkg/indexcopy.cc:261
msgid "Completely removed %s"
msgstr "%s полностью удалён"
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Не удалось пропатчить файл"
-
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Соединение закрыто преждевременно"
+#~ msgid "Could not patch file"
+#~ msgstr "Не удалось пропатчить файл"
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-09-10 18:50+0200\n"
"Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
msgid "Wrong CD-ROM"
msgstr "Chybné CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Nedá sa odpojiť CD-ROM v %s - možno sa ešte používa."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disk sa nenašiel."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Súbor sa nenašiel"
msgid "Unable to accept connection"
msgstr "Spojenie sa nedá prijať"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hashovaním súboru"
msgid "Read error from %s process"
msgstr "Chyba pri čítaní z procesu %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Čaká sa na hlavičky"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Získal sa jeden riadok hlavičky cez %u znakov"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Chybná hlavička"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP server poslal neplatnú hlavičku odpovede"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP server poslal neplatnú hlavičku Content-Length"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP server poslal neplatnú hlavičku Content-Range"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má poškodenú podporu rozsahov"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Neznámy formát dátumu"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Výber zlyhal"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Uplynul čas spojenia"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupného súboru"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Chyba pri čítaní zo servera"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Zlé dátové záhlavie"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Spojenie zlyhalo"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Vnútorná chyba"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaktická chyba %s:%u: Na konci súboru sú chybné údaje"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Chyba!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Hotovo"
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Je nutné preinštalovať balík %s, ale nemôžem pre neho nájsť archív."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené "
"pridržanými balíkmi."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Sťahuje sa %li. súbor z %li (zostáva %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Sťahuje sa %li. súbor z %li"
msgid "You may want to run apt-get update to correct these problems"
msgstr "Na opravu týchto problémov môžete skúsiť spustiť apt-get update"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Neplatný záznam v súbore preferencií, žiadne záhlavie balíka"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Nezrozumiteľné pripevnenie typu %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Pre pripevnenie nebola zadaná žiadna (alebo nulová) priorita"
msgid "rename failed, %s (%s -> %s)."
msgstr "premenovanie zlyhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Nezhoda MD5 súčtov"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je "
"potrebné opraviť manuálne (kvôli chýbajúcej architektúre)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík "
"manuálne."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Veľkosti sa nezhodujú"
msgstr ""
"Nájdených %i indexov balíkov, %i indexov zdrojových balíkov a %i signatúr\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Uložená menovka: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Neplatný názov, skúste znova.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Názov tohto disku je: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopírujú sa zoznamy balíkov..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Zapisuje sa nový zoznam zdrojov\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Položky zoznamu zdrojov pre tento disk sú:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "CD-ROM sa odpája..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2005-02-16 22:18+0100\n"
"Last-Translator: Jure Cuhalev <gandalf@owca.info>\n"
"Language-Team: Slovenian <sl@li.org>\n"
msgid "Wrong CD-ROM"
msgstr "Napaèen C"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Ni mogoèe odklopiti CD-ROM-a v %s, ker je morda ¹e v uporabi."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
#, fuzzy
msgid "Disk not found."
msgstr "Datoteke ni mogoèe najti"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Datoteke ni mogoèe najti"
msgid "Unable to accept connection"
msgstr "Ni mogoèe sprejeti povezave"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Te¾ava pri razpr¹evanju datoteke"
msgid "Read error from %s process"
msgstr "Napaka pri branju iz procesa %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Èakanje na glave"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Dobljena je ena vrstica glave preko %u znakov"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Napaèna vrstica glave"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Stre¾nik HTTP je poslal napaèno glavo odgovora"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Stre¾nik HTTP je poslal glavo z napaèno dol¾ino vsebine"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Stre¾nik HTTP je poslal glavo z napaènim obsegom vsebine"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Ta stre¾nik HTTP ima pokvarjen obseg podpore"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Neznana oblika datuma"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Izbira ni uspela"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Èas za povezavo se je iztekel"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Napaka pri pisanju v izhodno datoteko"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Napaka pri branju oddaljene in zaprte povezave s stre¾nika "
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Napaka pri branju s stre¾nika"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Napaèni podatki glave"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Povezava ni uspela"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Notranja napaka"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Skladenjska napaka %s:%u: Dodatno smetje na koncu datoteke"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s ... Napaka!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Narejeno"
msgstr ""
"Paket %s mora biti ponovno name¹èen, vendar ne morem najti arhiva zanj."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Napaka. pkgProblemResolver::Napake pri razre¹itvi, ki so jih morda "
"povzroèili zadr¾ani paketi."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Ni mogoèe popraviti te¾av. Imate zadr¾ane pakete."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Branje seznama datotek"
msgid "You may want to run apt-get update to correct these problems"
msgstr "Èe ¾elite odpraviti te¾ave, poskusite zagnati apt-get update."
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Napaèen zapis v datoteki z nastavitvami. Ni glave paketa"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Ni mogoèe razumeti vrste zaponke %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Prioriteta zaponke ni doloèena ali pa je niè."
msgid "rename failed, %s (%s -> %s)."
msgstr "preimenovanje spodletelo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Neujemanje vsote MD5"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"Ni bilo mogoèe najti datoteke za paket %s. Morda boste morali roèno "
"popraviti ta paket (zaradi manjkajoèega arhiva)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Ni bilo mogoèe najti datoteke za paket %s. Morda boste morali roèno "
"popraviti ta paket."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket "
"%s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Neujemanje velikosti"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Na¹el sem %i kazal paketov, %i kazal izvornih paketov in %i podpisov\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Shranjena oznaka: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "To ni veljavno ime, poskusite ¹e enkrat.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Ta medij se imenuje: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopiranje seznama paketov..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Pi¹em nov seznam virov\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Izvorni vnosi za ta medij so:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Odklapljam CD-ROM..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-08-18 15:45+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
msgid "Wrong CD-ROM"
msgstr "Fel cd"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande används."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disk ej funnen."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Filen ej funnen"
msgid "Unable to accept connection"
msgstr "Kunde inte ta emot anslutning"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem med att lägga filen till hashtabellen"
msgid "Read error from %s process"
msgstr "Läsfel på %s-processen"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Väntar på huvuden"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fick en ensam huvudrad på %u tecken"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Trasig huvudrad"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Http-servern sände ett ogiltigt svarshuvud"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http-servern sände ett ogiltigt Content-Length-huvud"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http-servern sände ett ogiltigt Content-Range-huvud"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Denna http-servers stöd för delvis hämtning fungerar inte"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Okänt datumformat"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "\"Select\" misslyckades"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Tidsgränsen för anslutningen nåddes"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Fel vid skrivning till utdatafil"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Fel vid skrivning till fil"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Fel vid skrivning till filen"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Fel vid läsning från server"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Trasigt data i huvud"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Anslutning misslyckades"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Internt fel"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaxfel %s:%u: Överflödigt skräp vid filens slut"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Fel!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Färdig"
msgstr ""
"Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på "
"hållna paket."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kunde inte korrigera problemen, du har hållt trasiga paket."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Hämtar fil %li av %li (%s återstår)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Hämtar fil %li av %li"
msgstr "Du kan möjligen rätta till problemet genom att köra \"apt-get update\""
# "Package" är en sträng i inställningsfilen
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Ogiltig post i inställningsfilen, \"Package\"-huvud saknas"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Förstod inte nåltypen %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Prioritet ej angiven (eller noll) för nål"
msgid "rename failed, %s (%s -> %s)."
msgstr "namnbyte misslyckades, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5-kontrollsumma stämmer inte"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "Det finns ingen publik nyckel tillgänglig för följande nyckel-id:n:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"Jag kunde inte lokalisera någon fil för paketet %s. Detta kan betyda att du "
"manuellt måste reparera detta paket (på grund av saknad arkitektur)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Jag kunde inte lokalisera någon fil för paketet %s. Detta kan betyda att du "
"manuellt måste reparera detta paket."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Paketindexfilerna är trasiga. Inget \"Filename:\"-fält för paketet %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Storleken stämmer inte"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Hittade %i paketindex, %i källkodsindex och %i signaturer\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Etikett: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Namnet är ogiltigt, försök igen.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Denna skiva heter: \n"
"\"%s\"\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopierar paketlistor..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Skriver ny källista\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Poster i källistan för denna skiva:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Avmonterar cd-rom..."
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-19 11:37+0100\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2007-03-29 21:36+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
msgid "Wrong CD-ROM"
msgstr "Maling CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Hindi mai-unmount ang CD-ROM sa %s, maaaring ginagamit pa ito."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Hindi nahanap ang Disk."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Hindi Nahanap ang Talaksan"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Kinukuha ang talaksang %li ng %li"
"Maaaring patakbuhin niyo ang apt-get update upang ayusin ang mga problemang "
"ito"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Hindi naintindihan ang uri ng pin %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Walang prioridad (o sero) na nakatakda para sa pin"
msgid "rename failed, %s (%s -> %s)."
msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "Walang public key na magamit para sa sumusunod na key ID:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
"paketeng %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Di tugmang laki"
"Nakahanap ng %i na index ng mga pakete, %i na index ng source at %i na "
"signature\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Naka-imbak na Label: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Hindi yan tanggap na pangalan, subukan muli.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Ang Disc na ito ay nagngangalang: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kinokopya ang Listahan ng mga Pakete"
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Sinusulat ang bagong listahan ng pagkukunan\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Ina-unmount ang CD-ROM..."
#: apt-pkg/indexcopy.cc:261
# Vietnamese Translation for Apt.
# This file is put in the public domain.
-# Clytie Siddall <clytie@riverland.net.au>, 2005, 2006.
+# Clytie Siddall <clytie@riverland.net.au>, 2005, 2006, 2007.
#
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
-"PO-Revision-Date: 2006-09-21 17:16+0930\n"
+"POT-Creation-Date: 2007-05-08 11:09+0200\n"
+"PO-Revision-Date: 2007-06-01 15:00+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.6fc1\n"
+"X-Generator: LocFactoryEditor 1.6.3b1\n"
#: cmdline/apt-cache.cc:135
#, c-format
msgid "Wrong CD-ROM"
msgstr "CD không đúng"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Không thể tháo gắn kết đĩa CD-ROM trong %s. Có lẽ nó còn dùng."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Không tìm thấy đĩa"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Không tìm thấy tập tin"
msgid "Unable to accept connection"
msgstr "Không thể chấp nhận kết nối"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Gặp khó khăn băm tập tin"
msgid "Read error from %s process"
msgstr "Gặp lỗi đọc từ tiến trình %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Đang đợi những phần đầu..."
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Đã lấy một dòng đầu riêng lẻ chứa hơn %u ky tự"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Dòng đầu sai"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Máy phục vụ HTTP đã gởi một dòng đầu trả lời không hợp lệ"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
"Máy phục vụ HTTP đã gởi một dòng đầu Content-Length (độ dài nội dụng) không "
"hợp lệ"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
"Máy phục vụ HTTP đã gởi một dòng đầu Content-Range (phạm vị nội dụng) không "
"hợp lệ"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Không biết dạng ngày"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Việc chọn bị lỗi"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Kết nối đã quá giờ"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Gặp lỗi khi ghi vào tập tin xuất"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Gặp lỗi khi ghi vào tập tin"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Gặp lỗi khi ghi vào tập tin đó"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng kết nối"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Gặp lỗi khi đọc từ máy phục vụ"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Dữ liệu dòng đầu sai"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Kết nối bị ngắt"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Gặp lỗi nội bộ"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Gặp lỗi cú pháp %s:%u: rác thêm tại kết thúc tập tin"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Lỗi."
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Xong"
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Lỗi: « pkgProblemResolver::Resolve » (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo "
"ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Không thể sửa vấn đề, bạn đã giữ lại một số gói bị ngắt."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Đang lấy tập tin %li trên %li (%s còn lại)..."
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Đang lấy tập tin %li trên %li..."
msgstr ""
"Có lẽ bạn muốn chạy « apt-get update » (lấy cập nhật) để sửa các vấn đề này"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
"Gặp mục ghi không hợp lệ trong tập tin tùy thích: không có phần đầu Package "
"(Gói)."
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Không hiểu kiểu ghim %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim"
msgid "rename failed, %s (%s -> %s)."
msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum (tổng kiểm) không khớp được"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
"này, do thiếu kiến trúc."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
"này."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
"Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập "
"tin:) cho gói %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Kích cỡ không khớp được"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Mới tìm %i chỉ mục gói, %i chỉ mục nguồn và %i chữ ký\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, c-format
+msgid "Found label '%s'\n"
+msgstr "Nhãn đã lưu : « %s »\n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Nó không phải là một tên hợp lệ: hãy thử lại.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"Tên đĩa này:\n"
"%s\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Đang sao chép các danh sách gói..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Đang ghi danh sách nguồn mới...\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
-msgstr "Đang tháo lắp đĩa CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+msgid "Unmounting CD-ROM...\n"
+msgstr "Đang tháo lắp đĩa CD-ROM...\n"
#: apt-pkg/indexcopy.cc:261
#, c-format
msgstr ""
"Project-Id-Version: apt 0.5.23\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-19 11:37+0100\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2007-03-29 17:14+0800\n"
"Last-Translator: Kov Chai <tchaikov@sjtu.org>\n"
"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
msgid "Unparsable control file"
msgstr "不能解析的主控文件"
-#: methods/cdrom.cc:115
+#: methods/cdrom.cc:114
#, c-format
msgid "Unable to read the cdrom database %s"
msgstr "无法读取光盘数据库 %s"
-#: methods/cdrom.cc:124
+#: 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"
"请使用 apt-cdrom，通过它就可以让 APT 能识别该光盘。apt-get upgdate 不能被用来"
"加入新的光盘。"
-#: methods/cdrom.cc:132
+#: methods/cdrom.cc:131
msgid "Wrong CD-ROM"
msgstr "错误的光盘"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "正在下载 %li 个文件中的第 %li 个(还有 %s 个)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "正在下载 %2$li 个文件中的 %1$li 个"
msgid "You may want to run apt-get update to correct these problems"
msgstr "您可能需要运行 apt-get update 来解决这些问题"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "偏好设定(preferences)文件中发现有无效的记录，无 Package 字段头"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "无法识别锁定的类型(pin type) %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "没有为版本锁定指定优先级(或为零)"
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件，%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 key ID 没有可用的公钥：\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "大小不符"
"现把 %s 作为了 CD-ROM 的挂载点\n"
"正在挂载 CD-ROM\n"
-#: apt-pkg/cdrom.cc:518 apt-pkg/cdrom.cc:600
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
msgid "Identifying.. "
msgstr "正在鉴别.. "
-#: apt-pkg/cdrom.cc:543
+#: apt-pkg/cdrom.cc:541
#, c-format
msgid "Stored label: %s \n"
msgstr "存档标签：%s \n"
-#: apt-pkg/cdrom.cc:563
+#: apt-pkg/cdrom.cc:561
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
-#: apt-pkg/cdrom.cc:581
+#: apt-pkg/cdrom.cc:579
msgid "Unmounting CD-ROM\n"
msgstr "正在卸载 CD-ROM 文件系统\n"
-#: apt-pkg/cdrom.cc:585
+#: apt-pkg/cdrom.cc:583
msgid "Waiting for disc...\n"
msgstr "等待插入盘片……\n"
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:593
+#: apt-pkg/cdrom.cc:591
msgid "Mounting CD-ROM...\n"
msgstr "正在挂载 CD-ROM 文件系统……\n"
-#: apt-pkg/cdrom.cc:611
+#: apt-pkg/cdrom.cc:609
msgid "Scanning disc for index files..\n"
msgstr "正在光盘中查找索引文件..\n"
-#: apt-pkg/cdrom.cc:649
+#: apt-pkg/cdrom.cc:647
#, c-format
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "找到了 %i 个软件包索引、%i 个源代码包索引，和 %i 个数字签名\n"
-#: apt-pkg/cdrom.cc:714
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "存档标签：%s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "这不是一个有效的名字，请再次命名。\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"这张光盘现在的名字是：\n"
"“%s”\n"
-#: apt-pkg/cdrom.cc:734
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "正在复制软件包列表……"
-#: apt-pkg/cdrom.cc:758
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "正在写入新的软件包源列表\n"
-#: apt-pkg/cdrom.cc:767
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "对应于该光盘的软件包源设置项是：\n"
-#: apt-pkg/cdrom.cc:810
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "正在卸载 CD-ROM 文件系统……"
#: apt-pkg/indexcopy.cc:261
msgstr ""
"Project-Id-Version: 0.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-21 16:58+0800\n"
"Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
"Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
msgid "Wrong CD-ROM"
msgstr "碟片不正確。"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "無法下駕『%s』內的碟片，或許它仍在使用中。"
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "找不到磁碟"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "找不到檔案"
msgid "Unable to accept connection"
msgstr "無法允許連線"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "問題雜湊表"
msgid "Read error from %s process"
msgstr "從 %s 進程讀取錯誤"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "等待標頭"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "取得一個單行超過 %u 字元的標頭"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "壞的標頭"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "http 伺服器傳送一個無效的回覆標頭"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http 伺服器傳送一個無效的 Content-Length 標頭"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http 伺服器傳送一個無效的 Content-Range 標頭"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "http 伺服器有損毀的範圍支援"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "未知的資料格式"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Select 失敗"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "連線逾時"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "寫入輸出檔時發生錯誤"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "寫入檔案時發生錯誤"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "寫入檔案時發生錯誤"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "從遠端主機讀取錯誤，關閉連線"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "從伺服器讀取發生錯誤"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "壞的標頭資料"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "連線失敗"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "內部錯誤"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "語法錯誤 %s:%u: 檔案後有多餘的垃圾"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... 錯誤！"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... 完成"
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "套件『%s』需要重新安裝，但找不到軟件檔案。"
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr "無法解決依存關係。可能原因是某些套件被押後。"
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "無法解決問題，因為某些損毀的套件被押後。"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "正在下載第 %li 個文件(共 %li 個，尚需 %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "正在下載第%li個檔案(共有%li)"
msgid "You may want to run apt-get update to correct these problems"
msgstr "用『apt-get -f install』指令或許能修正這些問題。"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "喜好檔有錯誤—缺少套件前置檔。"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "本軟體不支持『%s』型的版本釘子。"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "對於釘住的檔案無優先順序"
msgid "rename failed, %s (%s -> %s)."
msgstr "檔名因『%s』更換失敗 (%s → %s)。"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5 檢查碼不符合。"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 key ID 沒有可用的公鑰：\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。"
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "檔案大小不符合。"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "找到 %i 個套件索引，%i 源碼索引和 %i 簽名\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "保存標誌：%s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "這不是合法名稱，重試一下。\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"這個碟片名為：\n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "複製套件清單中"
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "寫入新的來源列表中\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "該碟片的來源列表項目為：\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "卸載光碟機中..."
#: apt-pkg/indexcopy.cc:261
projects / apt.git / commitdiff
