From: Michael Vogt <egon@bottom>
Date: Thu, 14 Dec 2006 10:45:18 +0000 (+0100)
Subject: * merged the no-pragma branch
X-Git-Tag: 0.7.21~284^2~10
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/5cb3acda9e97a13e669746b9e772350c7938e731?hp=-c

* merged the no-pragma branch
---

5cb3acda9e97a13e669746b9e772350c7938e731
diff --combined apt-pkg/acquire-item.h
index 217ddb3ef,b47e198d8..cc46282d6
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@@ -9,8 -9,8 +9,8 @@@
     the Owner Acquire class. Derived classes will then call QueueURI to 
     register all the URI's they wish to fetch at the initial moment.   
     
 -   Two item classes are provided to provide functionality for downloading
 -   of Index files and downloading of Packages.
 +   Three item classes are provided to provide functionality for
 +   downloading of Index, Translation and Packages files.
     
     A Archive class is provided for downloading .deb files. It does Md5
     checking and source location as well as a retry algorithm.
@@@ -27,490 -27,68 +27,487 @@@
  #include <apt-pkg/pkgrecords.h>
  #include <apt-pkg/indexrecords.h>
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/acquire-item.h"
- #endif 
  
 -// Item to acquire
 +/** \addtogroup acquire
 + *  @{
 + *
 + *  \file acquire-item.h
 + */
 +
 +/** \brief Represents the process by which a pkgAcquire object should
 + *  retrieve a file or a collection of files.
 + *
 + *  By convention, Item subclasses should insert themselves into the
 + *  acquire queue when they are created by calling QueueURI(), and
 + *  remove themselves by calling Dequeue() when either Done() or
 + *  Failed() is invoked.  Item objects are also responsible for
 + *  notifying the download progress indicator (accessible via
 + *  #Owner->Log) of their status.
 + *
 + *  \see pkgAcquire
 + */
  class pkgAcquire::Item
  {  
     protected:
     
 -   // Some private helper methods for registering URIs
 +   /** \brief The acquire object with which this item is associated. */
     pkgAcquire *Owner;
 +
 +   /** \brief Insert this item into its owner's queue.
 +    *
 +    *  \param ItemDesc Metadata about this item (its URI and
 +    *  description).
 +    */
     inline void QueueURI(ItemDesc &Item)
                   {Owner->Enqueue(Item);};
 +
 +   /** \brief Remove this item from its owner's queue. */
     inline void Dequeue() {Owner->Dequeue(this);};
     
 -   // Safe rename function with timestamp preservation
 +   /** \brief Rename a file without modifying its timestamp.
 +    *
 +    *  Many item methods call this as their final action.
 +    *
 +    *  \param From The file to be renamed.
 +    *
 +    *  \param To The new name of #From.  If #To exists it will be
 +    *  overwritten.
 +    */
     void Rename(string From,string To);
     
     public:
  
 -   // State of the item
 -   enum {StatIdle, StatFetching, StatDone, StatError, StatAuthError} Status;
 +   /** \brief The current status of this item. */
 +   enum ItemState
 +     {
 +       /** \brief The item is waiting to be downloaded. */
 +       StatIdle,
 +
 +       /** \brief The item is currently being downloaded. */
 +       StatFetching,
 +
 +       /** \brief The item has been successfully downloaded. */
 +       StatDone,
 +
 +       /** \brief An error was encountered while downloading this
 +	*  item.
 +	*/
 +       StatError,
 +
 +       /** \brief The item was downloaded but its authenticity could
 +	*  not be verified.
 +	*/
 +       StatAuthError
 +     } Status;
 +
 +   /** \brief Contains a textual description of the error encountered
 +    *  if #Status is #StatError or #StatAuthError.
 +    */
     string ErrorText;
 +
 +   /** \brief The size of the object to fetch. */
     unsigned long FileSize;
 -   unsigned long PartialSize;   
 +
 +   /** \brief How much of the object was already fetched. */
 +   unsigned long PartialSize;
 +
 +   /** \brief If not \b NULL, contains the name of a subprocess that
 +    *  is operating on this object (for instance, "gzip" or "gpgv").
 +    */
     const char *Mode;
 +
 +   /** \brief A client-supplied unique identifier.
 +    * 
 +    *  This field is initalized to 0; it is meant to be filled in by
 +    *  clients that wish to use it to uniquely identify items.
 +    *
 +    *  \todo it's unused in apt itself
 +    */
     unsigned long ID;
 +
 +   /** \brief If \b true, the entire object has been successfully fetched.
 +    *
 +    *  Subclasses should set this to \b true when appropriate.
 +    */
     bool Complete;
 +
 +   /** \brief If \b true, the URI of this object is "local".
 +    *
 +    *  The only effect of this field is to exclude the object from the
 +    *  download progress indicator's overall statistics.
 +    */
     bool Local;
  
 -   // Number of queues we are inserted into
 +   /** \brief The number of fetch queues into which this item has been
 +    *  inserted.
 +    *
 +    *  There is one queue for each source from which an item could be
 +    *  downloaded.
 +    *
 +    *  \sa pkgAcquire
 +    */
     unsigned int QueueCounter;
     
 -   // File to write the fetch into
 +   /** \brief The name of the file into which the retrieved object
 +    *  will be written.
 +    */
     string DestFile;
  
 -   // Action members invoked by the worker
 +   /** \brief Invoked by the acquire worker when the object couldn't
 +    *  be fetched.
 +    *
 +    *  This is a branch of the continuation of the fetch process.
 +    *
 +    *  \param Message An RFC822-formatted message from the acquire
 +    *  method describing what went wrong.  Use LookupTag() to parse
 +    *  it.
 +    *
 +    *  \param Cnf The method via which the worker tried to fetch this object.
 +    *
 +    *  \sa pkgAcqMethod
 +    */
     virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
 +
 +   /** \brief Invoked by the acquire worker when the object was
 +    *  fetched successfully.
 +    *
 +    *  Note that the object might \e not have been written to
 +    *  DestFile; check for the presence of an Alt-Filename entry in
 +    *  Message to find the file to which it was really written.
 +    *
 +    *  Done is often used to switch from one stage of the processing
 +    *  to the next (e.g. fetching, unpacking, copying).  It is one
 +    *  branch of the continuation of the fetch process.
 +    *
 +    *  \param Message Data from the acquire method.  Use LookupTag()
 +    *  to parse it.
 +    *  \param Size The size of the object that was fetched.
 +    *  \param Md5Hash The MD5Sum of the object that was fetched.
 +    *  \param Cnf The method via which the object was fetched.
 +    *
 +    *  \sa pkgAcqMethod
 +    */
     virtual void Done(string Message,unsigned long Size,string Md5Hash,
  		     pkgAcquire::MethodConfig *Cnf);
 +
 +   /** \brief Invoked when the worker starts to fetch this object.
 +    *
 +    *  \param Message RFC822-formatted data from the worker process.
 +    *  Use LookupTag() to parse it.
 +    *
 +    *  \param Size The size of the object being fetched.
 +    *
 +    *  \sa pkgAcqMethod
 +    */
     virtual void Start(string Message,unsigned long Size);
 +
 +   /** \brief Custom headers to be sent to the fetch process.
 +    *
 +    *  \return a string containing RFC822-style headers that are to be
 +    *  inserted into the 600 URI Acquire message sent to the fetch
 +    *  subprocess.  The headers are inserted after a newline-less
 +    *  line, so they should (if nonempty) have a leading newline and
 +    *  no trailing newline.
 +    */
     virtual string Custom600Headers() {return string();};
 +
 +   /** \brief A "descriptive" URI-like string.
 +    *
 +    *  \return a URI that should be used to describe what is being fetched.
 +    */
     virtual string DescURI() = 0;
 +   /** \brief Short item description.
 +    *
 +    *  \return a brief description of the object being fetched.
 +    */
     virtual string ShortDesc() {return DescURI();}
 +
 +   /** \brief Invoked by the worker when the download is completely done. */
     virtual void Finished() {};
     
 -   // Inquire functions
 +   /** \brief MD5Sum.
 +    *
 +    *  \return the MD5Sum of this object, if applicable; otherwise, an
 +    *  empty string.
 +    */
     virtual string MD5Sum() {return string();};
 +
 +   /** \return the acquire process with which this item is associated. */
     pkgAcquire *GetOwner() {return Owner;};
 +
 +   /** \return \b true if this object is being fetched from a trusted source. */
     virtual bool IsTrusted() {return false;};
 -   
 +
 +   /** \brief Initialize an item.
 +    *
 +    *  Adds the item to the list of items known to the acquire
 +    *  process, but does not place it into any fetch queues (you must
 +    *  manually invoke QueueURI() to do so).
 +    *
 +    *  Initializes all fields of the item other than Owner to 0,
 +    *  false, or the empty string.
 +    *
 +    *  \param Owner The new owner of this item.
 +    */
     Item(pkgAcquire *Owner);
 +
 +   /** \brief Remove this item from its owner's queue by invoking
 +    *  pkgAcquire::Remove.
 +    */
     virtual ~Item();
  };
  
 -// Item class for index files
 -class pkgAcqIndex : public pkgAcquire::Item
 +/** \brief Information about an index patch (aka diff). */
 +struct DiffInfo {
 +   /** The filename of the diff. */
 +   string file;
 +
 +   /** The sha1 hash of the diff. */
 +   string sha1;
 +
 +   /** The size of the diff. */
 +   unsigned long size;
 +};
 +
 +/** \brief An item that is responsible for fetching an index file of
 + *  package list diffs and starting the package list's download.
 + *
 + *  This item downloads the Index file and parses it, then enqueues
 + *  additional downloads of either the individual patches (using
 + *  pkgAcqIndexDiffs) or the entire Packages file (using pkgAcqIndex).
 + *
 + *  \sa pkgAcqIndexDiffs, pkgAcqIndex
 + */
 +class pkgAcqDiffIndex : public pkgAcquire::Item
  {
 + protected:
 +   /** \brief If \b true, debugging information will be written to std::clog. */
 +   bool Debug;
 +
 +   /** \brief The item that is currently being downloaded. */
 +   pkgAcquire::ItemDesc Desc;
 +
 +   /** \brief The URI of the index file to recreate at our end (either
 +    *  by downloading it or by applying partial patches).
 +    */
 +   string RealURI;
 +
 +   /** \brief The MD5Sum that the real index file should have after
 +    *  all patches have been applied.
 +    */
 +   string ExpectedMD5;
 +
 +   /** \brief The index file which will be patched to generate the new
 +    *  file.
 +    */
 +   string CurrentPackagesFile;
 +
 +   /** \brief A description of the Packages file (stored in
 +    *  pkgAcquire::ItemDesc::Description).
 +    */
 +   string Description;
 +
 + public:
 +   // Specialized action members
 +   virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
 +   virtual void Done(string Message,unsigned long Size,string Md5Hash,
 +		     pkgAcquire::MethodConfig *Cnf);
 +   virtual string DescURI() {return RealURI + "Index";};
 +   virtual string Custom600Headers();
 +
 +   /** \brief Parse the Index file for a set of Packages diffs.
 +    *
 +    *  Parses the Index file and creates additional download items as
 +    *  necessary.
 +    *
 +    *  \param IndexDiffFile The name of the Index file.
 +    *
 +    *  \return \b true if the Index file was successfully parsed, \b
 +    *  false otherwise.
 +    */
 +   bool ParseDiffIndex(string IndexDiffFile);
 +   
 +
 +   /** \brief Create a new pkgAcqDiffIndex.
 +    *
 +    *  \param Owner The Acquire object that owns this item.
 +    *
 +    *  \param URI The URI of the list file to download.
 +    *
 +    *  \param URIDesc A long description of the list file to download.
 +    *
 +    *  \param ShortDesc A short description of the list file to download.
 +    *
 +    *  \param ExpectedMD5 The list file's MD5 signature.
 +    */
 +   pkgAcqDiffIndex(pkgAcquire *Owner,string URI,string URIDesc,
 +		   string ShortDesc, string ExpectedMD5);
 +};
 +
 +/** \brief An item that is responsible for fetching all the patches
 + *  that need to be applied to a given package index file.
 + *
 + *  After downloading and applying a single patch, this item will
 + *  enqueue a new pkgAcqIndexDiffs to download and apply the remaining
 + *  patches.  If no patch can be found that applies to an intermediate
 + *  file or if one of the patches cannot be downloaded, falls back to
 + *  downloading the entire package index file using pkgAcqIndex.
 + *
 + *  \sa pkgAcqDiffIndex, pkgAcqIndex
 + */
 +class pkgAcqIndexDiffs : public pkgAcquire::Item
 +{
 +   private:
 +
 +   /** \brief Queue up the next diff download.
 +    *
 +    *  Search for the next available diff that applies to the file
 +    *  that currently exists on disk, and enqueue it by calling
 +    *  QueueURI().
 +    *
 +    *  \return \b true if an applicable diff was found, \b false
 +    *  otherwise.
 +    */
 +   bool QueueNextDiff();
 +
 +   /** \brief Handle tasks that must be performed after the item
 +    *  finishes downloading.
 +    *
 +    *  Dequeues the item and checks the resulting file's md5sum
 +    *  against ExpectedMD5 after the last patch was applied.
 +    *  There is no need to check the md5/sha1 after a "normal" 
 +    *  patch because QueueNextDiff() will check the sha1 later.
 +    *
 +    *  \param allDone If \b true, the file was entirely reconstructed,
 +    *  and its md5sum is verified. 
 +    */
 +   void Finish(bool allDone=false);
 +
     protected:
 +
 +   /** \brief If \b true, debugging output will be written to
 +    *  std::clog.
 +    */
 +   bool Debug;
 +
 +   /** \brief A description of the item that is currently being
 +    *  downloaded.
 +    */
 +   pkgAcquire::ItemDesc Desc;
 +
 +   /** \brief The URI of the package index file that is being
 +    *  reconstructed.
 +    */
 +   string RealURI;
 +
 +   /** \brief The MD5Sum of the package index file that is being
 +    *  reconstructed.
 +    */
 +   string ExpectedMD5;
 +
 +   /** A description of the file being downloaded. */
 +   string Description;
 +
 +   /** The patches that remain to be downloaded, including the patch
 +    *  being downloaded right now.  This list should be ordered so
 +    *  that each diff appears before any diff that depends on it.
 +    *
 +    *  \todo These are indexed by sha1sum; why not use some sort of
 +    *  dictionary instead of relying on ordering and stripping them
 +    *  off the front?
 +    */
 +   vector<DiffInfo> available_patches;
 +   /** The current status of this patch. */
 +   enum DiffState
 +     {
 +	/** \brief The diff is in an unknown state. */
 +	 StateFetchUnkown,
 +
 +	 /** \brief The diff is currently being fetched. */
 +	 StateFetchDiff,
 +	 
 +	 /** \brief The diff is currently being uncompressed. */
 +	 StateUnzipDiff,
 +
 +	 /** \brief The diff is currently being applied. */
 +	 StateApplyDiff
 +   } State;
 +
 +   public:
     
 +   /** \brief Called when the patch file failed to be downloaded.
 +    *
 +    *  This method will fall back to downloading the whole index file
 +    *  outright; its arguments are ignored.
 +    */
 +   virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
 +
 +   virtual void Done(string Message,unsigned long Size,string Md5Hash,
 +		     pkgAcquire::MethodConfig *Cnf);
 +   virtual string DescURI() {return RealURI + "Index";};
 +
 +   /** \brief Create an index diff item.
 +    *
 +    *  After filling in its basic fields, this invokes Finish(true) if
 +    *  #diffs is empty, or QueueNextDiff() otherwise.
 +    *
 +    *  \param Owner The pkgAcquire object that owns this item.
 +    *
 +    *  \param URI The URI of the package index file being
 +    *  reconstructed.
 +    *
 +    *  \param URIDesc A long description of this item.
 +    *
 +    *  \param ShortDesc A brief description of this item.
 +    *
 +    *  \param ExpectedMD5 The expected md5sum of the completely
 +    *  reconstructed package index file; the index file will be tested
 +    *  against this value when it is entirely reconstructed.
 +    *
 +    *  \param diffs The remaining diffs from the index of diffs.  They
 +    *  should be ordered so that each diff appears before any diff
 +    *  that depends on it.
 +    */
 +   pkgAcqIndexDiffs(pkgAcquire *Owner,string URI,string URIDesc,
 +		    string ShortDesc, string ExpectedMD5,
 +		    vector<DiffInfo> diffs=vector<DiffInfo>());
 +};
 +
 +/** \brief An acquire item that is responsible for fetching an index
 + *  file (e.g., Packages or Sources).
 + *
 + *  \sa pkgAcqDiffIndex, pkgAcqIndexDiffs, pkgAcqIndexTrans
 + *
 + *  \todo Why does pkgAcqIndex have protected members?
 + */
 +class pkgAcqIndex : public pkgAcquire::Item
 +{
 +   protected:
 +
 +   /** \brief If \b true, the index file has been decompressed. */
     bool Decompression;
 +
 +   /** \brief If \b true, the partially downloaded file will be
 +    *  removed when the download completes.
 +    */
     bool Erase;
 +
 +   /** \brief The download request that is currently being
 +    *   processed.
 +    */
     pkgAcquire::ItemDesc Desc;
 +
 +   /** \brief The object that is actually being fetched (minus any
 +    *  compression-related extensions).
 +    */
     string RealURI;
 +
 +   /** \brief The expected md5sum of the decompressed index file. */
     string ExpectedMD5;
 +
 +   /** \brief The compression-related file extension that is being
 +    *  added to the downloaded file (e.g., ".gz" or ".bz2").
 +    */
     string CompressionExtension;
  
     public:
@@@ -522,120 -100,26 +519,120 @@@
     virtual string Custom600Headers();
     virtual string DescURI() {return RealURI + CompressionExtension;};
  
 +   /** \brief Create a pkgAcqIndex.
 +    *
 +    *  \param Owner The pkgAcquire object with which this item is
 +    *  associated.
 +    *
 +    *  \param URI The URI of the index file that is to be downloaded.
 +    *
 +    *  \param URIDesc A "URI-style" description of this index file.
 +    *
 +    *  \param ShortDesc A brief description of this index file.
 +    *
 +    *  \param ExpectedMD5 The expected md5sum of this index file.
 +    *
 +    *  \param compressExt The compression-related extension with which
 +    *  this index file should be downloaded, or "" to autodetect
 +    *  (".bz2" is used if bzip2 is installed, ".gz" otherwise).
 +    */
     pkgAcqIndex(pkgAcquire *Owner,string URI,string URIDesc,
 -	       string ShortDesct, string ExpectedMD5, string compressExt="");
 +	       string ShortDesc, string ExpectedMD5, string compressExt="");
  };
  
 +/** \brief An acquire item that is responsible for fetching a
 + *  translated index file.
 + *
 + *  The only difference from pkgAcqIndex is that transient failures
 + *  are suppressed: no error occurs if the translated index file is
 + *  missing.
 + */
 +class pkgAcqIndexTrans : public pkgAcqIndex
 +{
 +   public:
 +  
 +   virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
 +
 +   /** \brief Create a pkgAcqIndexTrans.
 +    *
 +    *  \param Owner The pkgAcquire object with which this item is
 +    *  associated.
 +    *
 +    *  \param URI The URI of the index file that is to be downloaded.
 +    *
 +    *  \param URIDesc A "URI-style" description of this index file.
 +    *
 +    *  \param ShortDesc A brief description of this index file.
 +    *
 +    *  \param ExpectedMD5 The expected md5sum of this index file.
 +    *
 +    *  \param compressExt The compression-related extension with which
 +    *  this index file should be downloaded, or "" to autodetect
 +    *  (".bz2" is used if bzip2 is installed, ".gz" otherwise).
 +    */
 +   pkgAcqIndexTrans(pkgAcquire *Owner,string URI,string URIDesc,
 +		    string ShortDesc);
 +};
 +
 +/** \brief Information about an index file. */
  struct IndexTarget
  {
 +   /** \brief A URI from which the index file can be downloaded. */
     string URI;
 +
 +   /** \brief A description of the index file. */
     string Description;
 +
 +   /** \brief A shorter description of the index file. */
     string ShortDesc;
 +
 +   /** \brief The key by which this index file should be
 +    *  looked up within the meta signature file.
 +    */
     string MetaKey;
  };
  
 -// Item class for index signatures
 +/** \brief An acquire item that downloads the detached signature
 + *  of a meta-index (Release) file, then queues up the release
 + *  file itself.
 + *
 + *  \todo Why protected members?
 + *
 + *  \sa pkgAcqMetaIndex
 + */
  class pkgAcqMetaSig : public pkgAcquire::Item
  {
     protected:
 -   
 +   /** \brief The fetch request that is currently being processed. */
     pkgAcquire::ItemDesc Desc;
 -   string RealURI,MetaIndexURI,MetaIndexURIDesc,MetaIndexShortDesc;
 +
 +   /** \brief The URI of the signature file.  Unlike Desc.URI, this is
 +    *  never modified; it is used to determine the file that is being
 +    *  downloaded.
 +    */
 +   string RealURI;
 +
 +   /** \brief The URI of the meta-index file to be fetched after the signature. */
 +   string MetaIndexURI;
 +
 +   /** \brief A "URI-style" description of the meta-index file to be
 +    *  fetched after the signature.
 +    */
 +   string MetaIndexURIDesc;
 +
 +   /** \brief A brief description of the meta-index file to be fetched
 +    *  after the signature.
 +    */
 +   string MetaIndexShortDesc;
 +
 +   /** \brief A package-system-specific parser for the meta-index file. */
     indexRecords* MetaIndexParser;
 +
 +   /** \brief The index files which should be looked up in the meta-index
 +    *  and then downloaded.
 +    *
 +    *  \todo Why a list of pointers instead of a list of structs?
 +    */
     const vector<struct IndexTarget*>* IndexTargets;
  
     public:
@@@ -647,90 -131,29 +644,90 @@@
     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:
@@@ -742,7 -165,6 +739,7 @@@
     virtual string Custom600Headers();
     virtual string DescURI() {return RealURI; };
  
 +   /** \brief Create a new pkgAcqMetaIndex. */
     pkgAcqMetaIndex(pkgAcquire *Owner,
  		   string URI,string URIDesc, string ShortDesc,
  		   string SigFile,
@@@ -750,58 -172,28 +747,58 @@@
  		   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);
@@@ -809,49 -201,18 +806,49 @@@
     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:
@@@ -863,40 -224,13 +860,40 @@@
     virtual string MD5Sum() {return Md5Hash;};
     virtual string DescURI() {return Desc.URI;};
  
 -   // If DestFilename is empty, download to DestDir/<basename> if
 -   // DestDir is non-empty, $CWD/<basename> otherwise.  If
 -   // DestFilename is NOT empty, DestDir is ignored and DestFilename
 -   // is the absolute name to which the file should be downloaded.
 +   /** \brief Create a new pkgAcqFile object.
 +    *
 +    *  \param Owner The pkgAcquire object with which this object is
 +    *  associated.
 +    *
 +    *  \param URI The URI to download.
 +    *
 +    *  \param MD5 The md5sum of the file to download, if it is known;
 +    *  otherwise "".
 +    *
 +    *  \param Size The size of the file to download, if it is known;
 +    *  otherwise 0.
 +    *
 +    *  \param Desc A description of the file being downloaded.
 +    *
 +    *  \param ShortDesc A brief description of the file being
 +    *  downloaded.
 +    *
 +    *  \param DestDir The directory the file should be downloaded into.
 +    *
 +    *  \param DestFilename The filename+path the file is downloaded to.
 +    *
 +    *
 +    * If DestFilename is empty, download to DestDir/<basename> if
 +    * DestDir is non-empty, $CWD/<basename> otherwise.  If
 +    * DestFilename is NOT empty, DestDir is ignored and DestFilename
 +    * is the absolute name to which the file should be downloaded.
 +    */
 +
     pkgAcqFile(pkgAcquire *Owner, string URI, string MD5, unsigned long Size,
  	      string Desc, string ShortDesc,
  	      const string &DestDir="", const string &DestFilename="");
  };
  
 +/** @} */
 +
  #endif
diff --combined apt-pkg/acquire-method.h
index 4f08a43ae,1c0b9f67c..0fd846f54
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@@ -10,22 -10,12 +10,19 @@@
     
     ##################################################################### */
  									/*}}}*/
 +
 +/** \addtogroup acquire
 + *  @{
 + *
 + *  \file acquire-method.h
 + */
 +
  #ifndef PKGLIB_ACQUIRE_METHOD_H
  #define PKGLIB_ACQUIRE_METHOD_H
  
  #include <apt-pkg/configuration.h>
  #include <apt-pkg/strutl.h>
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/acquire-method.h"
- #endif 
  
  class Hashes;
  class pkgAcqMethod
@@@ -93,6 -83,4 +90,6 @@@
     virtual ~pkgAcqMethod() {};
  };
  
 +/** @} */
 +
  #endif
diff --combined apt-pkg/acquire-worker.h
index 1f6bcc05f,d5f8c63d2..2942df69f
--- a/apt-pkg/acquire-worker.h
+++ b/apt-pkg/acquire-worker.h
@@@ -9,41 -9,13 +9,38 @@@
     
     ##################################################################### */
  									/*}}}*/
 +
 +/** \addtogroup acquire
 + *  @{
 + *
 + *  \file acquire-worker.h
 + */
 +
  #ifndef PKGLIB_ACQUIRE_WORKER_H
  #define PKGLIB_ACQUIRE_WORKER_H
  
  #include <apt-pkg/acquire.h>
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/acquire-worker.h"
- #endif 
  
 -// Interfacing to the method process
 +/** \brief A fetch subprocess.
 + *
 + *  A worker process is responsible for one stage of the fetch.  This
 + *  class encapsulates the communications protocol between the master
 + *  process and the worker, from the master end.
 + *
 + *  Each worker is intrinsically placed on two linked lists.  The
 + *  Queue list (maintained in the #NextQueue variable) is maintained
 + *  by the pkgAcquire::Queue class; it represents the set of workers
 + *  assigned to a particular queue.  The Acquire list (maintained in
 + *  the #NextAcquire variable) is maintained by the pkgAcquire class;
 + *  it represents the set of active workers for a particular
 + *  pkgAcquire object.
 + *
 + *  \todo Like everything else in the Acquire system, this has way too
 + *  many protected items.
 + *
 + *  \sa pkgAcqMethod, pkgAcquire::Item, pkgAcquire
 + */
  class pkgAcquire::Worker
  {
     friend class pkgAcquire;
@@@ -51,274 -23,64 +48,274 @@@
     protected:
     friend class Queue;
  
 -   /* Linked list starting at a Queue and a linked list starting
 -      at Acquire */
 +   /** \brief The next link on the Queue list.
 +    *
 +    *  \todo This is always NULL; is it just for future use?
 +    */
     Worker *NextQueue;
 +
 +   /** \brief The next link on the Acquire list. */
     Worker *NextAcquire;
     
 -   // The access association
 +   /** \brief The Queue with which this worker is associated. */
     Queue *OwnerQ;
 +
 +   /** \brief The download progress indicator to which progress
 +    *  messages should be sent.
 +    */
     pkgAcquireStatus *Log;
 +
 +   /** \brief The configuration of this method.  On startup, the
 +    *  target of this pointer is filled in with basic data about the
 +    *  method, as reported by the worker.
 +    */
     MethodConfig *Config;
 +
 +   /** \brief The access method to be used by this worker.
 +    *
 +    *  \todo Doesn't this duplicate Config->Access?
 +    */
     string Access;
  
 -   // This is the subprocess IPC setup
 +   /** \brief The PID of the subprocess. */
     pid_t Process;
 +
 +   /** \brief A file descriptor connected to the standard output of
 +    *  the subprocess.
 +    *
 +    *  Used to read messages and data from the subprocess.
 +    */
     int InFd;
 +
 +   /** \brief A file descriptor connected to the standard input of the
 +    *  subprocess.
 +    *
 +    *  Used to send commands and configuration data to the subprocess.
 +    */
     int OutFd;
 +
 +   /** \brief Set to \b true if the worker is in a state in which it
 +    *  might generate data or command responses.
 +    *
 +    *  \todo Is this right?  It's a guess.
 +    */
     bool InReady;
 +
 +   /** \brief Set to \b true if the worker is in a state in which it
 +    *  is legal to send commands to it.
 +    *
 +    *  \todo Is this right?
 +    */
     bool OutReady;
     
 -   // Various internal things
 +   /** If \b true, debugging output will be sent to std::clog. */
     bool Debug;
 +
 +   /** \brief The raw text values of messages received from the
 +    *  worker, in sequence.
 +    */
     vector<string> MessageQueue;
 +
 +   /** \brief Buffers pending writes to the subprocess.
 +    *
 +    *  \todo Wouldn't a std::dequeue be more appropriate?
 +    */
     string OutQueue;
     
 -   // Private constructor helper
 +   /** \brief Common code for the constructor.
 +    *
 +    *  Initializes NextQueue and NextAcquire to NULL; Process, InFd,
 +    *  and OutFd to -1, OutReady and InReady to \b false, and Debug
 +    *  from _config.
 +    */
     void Construct();
     
 -   // Message handling things
 +   /** \brief Retrieve any available messages from the subprocess.
 +    *
 +    *  The messages are retrieved as in ::ReadMessages(), and
 +    *  MessageFailure() is invoked if an error occurs; in particular,
 +    *  if the pipe to the subprocess dies unexpectedly while a message
 +    *  is being read.
 +    *
 +    *  \return \b true if the messages were successfully read, \b
 +    *  false otherwise.
 +    */
     bool ReadMessages();
 +
 +   /** \brief Parse and dispatch pending messages.
 +    *
 +    *  This dispatches the message in a manner appropriate for its
 +    *  type.
 +    *
 +    *  \todo Several message types lack separate handlers.
 +    *
 +    *  \sa Capabilities(), SendConfiguration(), MediaChange()
 +    */
     bool RunMessages();
 +
 +   /** \brief Read and dispatch any pending messages from the
 +    *  subprocess.
 +    *
 +    *  \return \b false if the subprocess died unexpectedly while a
 +    *  message was being transmitted.
 +    */
     bool InFdReady();
 +
 +   /** \brief Send any pending commands to the subprocess.
 +    *
 +    *  This method will fail if there is no pending output.
 +    *
 +    *  \return \b true if all commands were succeeded, \b false if an
 +    *  error occurred (in which case MethodFailure() will be invoked).
 +    */
     bool OutFdReady();
     
 -   // The message handlers
 +   /** \brief Handle a 100 Capabilities response from the subprocess.
 +    *
 +    *  \param Message the raw text of the message from the subprocess.
 +    *
 +    *  The message will be parsed and its contents used to fill
 +    *  #Config.  If #Config is NULL, this routine is a NOP.
 +    *
 +    *  \return \b true.
 +    */
     bool Capabilities(string Message);
 +
 +   /** \brief Send a 601 Configuration message (containing the APT
 +    *  configuration) to the subprocess.
 +    *
 +    *  The APT configuration will be send to the subprocess in a
 +    *  message of the following form:
 +    *
 +    *  <pre>
 +    *  601 Configuration
 +    *  Config-Item: Fully-Qualified-Item=Val
 +    *  Config-Item: Fully-Qualified-Item=Val
 +    *  ...
 +    *  </pre>
 +    *
 +    *  \return \b true if the command was successfully sent, \b false
 +    *  otherwise.
 +    */
     bool SendConfiguration();
 +
 +   /** \brief Handle a 403 Media Change message.
 +    *
 +    *  \param Message the raw text of the message; the Media field
 +    *  indicates what type of media should be changed, and the Drive
 +    *  field indicates where the media is located.
 +    *
 +    *  Invokes pkgAcquireStatus::MediaChange(Media, Drive) to ask the
 +    *  user to swap disks; informs the subprocess of the result (via
 +    *  603 Media Changed, with the Failed field set to \b true if the
 +    *  user cancelled the media change).
 +    */
     bool MediaChange(string Message);
     
 +   /** \brief Invoked when the worked process dies unexpectedly.
 +    *
 +    *  Waits for the subprocess to terminate and generates an error if
 +    *  it terminated abnormally, then closes and blanks out all file
 +    *  descriptors.  Discards all pending messages from the
 +    *  subprocess.
 +    *
 +    *  \return \b false.
 +    */
     bool MethodFailure();
 +
 +   /** \brief Invoked when a fetch job is completed, either
 +    *  successfully or unsuccessfully.
 +    *
 +    *  Resets the status information for the worker process.
 +    */
     void ItemDone();
     
     public:
     
 -   // The curent method state
 +   /** \brief The queue entry that is currently being downloaded. */
     pkgAcquire::Queue::QItem *CurrentItem;
 +
 +   /** \brief The most recent status string received from the
 +    *  subprocess.
 +    */
     string Status;
 +
 +   /** \brief How many bytes of the file have been downloaded.  Zero
 +    *  if the current progress of the file cannot be determined.
 +    */
     unsigned long CurrentSize;
 +
 +   /** \brief The total number of bytes to be downloaded.  Zero if the
 +    *  total size of the final is unknown.
 +    */
     unsigned long TotalSize;
 +
 +   /** \brief How much of the file was already downloaded prior to
 +    *  starting this worker.
 +    */
     unsigned long ResumePoint;
     
 -   // Load the method and do the startup 
 +   /** \brief Tell the subprocess to download the given item.
 +    *
 +    *  \param Item the item to queue up.
 +    *  \return \b true if the item was successfully enqueued.
 +    *
 +    *  Queues up a 600 URI Acquire message for the given item to be
 +    *  sent at the next possible moment.  Does \e not flush the output
 +    *  queue.
 +    */
     bool QueueItem(pkgAcquire::Queue::QItem *Item);
 +
 +   /** \brief Start up the worker and fill in #Config.
 +    *
 +    *  Reads the first message from the worker, which is assumed to be
 +    *  a 100 Capabilities message.
 +    *
 +    *  \return \b true if all operations completed successfully.
 +    */
     bool Start();
 +
 +   /** \brief Update the worker statistics (CurrentSize, TotalSize,
 +    *  etc).
 +    */
     void Pulse();
 +
 +   /** \return The fetch method configuration. */
     inline const MethodConfig *GetConf() const {return Config;};
 -   
 +
 +   /** \brief Create a new Worker to download files.
 +    *
 +    *  \param OwnerQ The queue into which this worker should be
 +    *  placed.
 +    *
 +    *  \param Config A location in which to store information about
 +    *  the fetch method.
 +    *
 +    *  \param Log The download progress indicator that should be used
 +    *  to report the progress of this worker.
 +    */
     Worker(Queue *OwnerQ,MethodConfig *Config,pkgAcquireStatus *Log);
 +
 +   /** \brief Create a new Worker that should just retrieve
 +    *  information about the fetch method.
 +    *
 +    *  Nothing in particular forces you to refrain from actually
 +    *  downloading stuff, but the various status callbacks won't be
 +    *  invoked.
 +    *
 +    *  \param Config A location in which to store information about
 +    *  the fetch method.
 +    */
     Worker(MethodConfig *Config);
 +
 +   /** \brief Clean up this worker.
 +    *
 +    *  Closes the file descriptors; if MethodConfig::NeedsCleanup is
 +    *  \b false, also rudely interrupts the worker with a SIGINT.
 +    */
     ~Worker();
  };
  
 +/** @} */
 +
  #endif
diff --combined apt-pkg/acquire.h
index 64dafdc9d,6e836ac49..d73a52c7a
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@@ -29,40 -29,6 +29,40 @@@
     
     ##################################################################### */
  									/*}}}*/
 +
 +/** \defgroup acquire Acquire system
 + *
 + *  \brief The Acquire system is responsible for retrieving files from
 + *  local or remote URIs and postprocessing them (for instance,
 + *  verifying their authenticity).  The core class in this system is
 + *  pkgAcquire, which is responsible for managing the download queues
 + *  during the download.  There is at least one download queue for
 + *  each supported protocol; protocols such as http may provide one
 + *  queue per host.
 + *
 + *  Each file to download is represented by a subclass of
 + *  pkgAcquire::Item.  The files add themselves to the download
 + *  queue(s) by providing their URI information to
 + *  pkgAcquire::Item::QueueURI, which calls pkgAcquire::Enqueue.
 + *
 + *  Once the system is set up, the Run method will spawn subprocesses
 + *  to handle the enqueued URIs; the scheduler will then take items
 + *  from the queues and feed them into the handlers until the queues
 + *  are empty.
 + *
 + *  \todo Acquire supports inserting an object into several queues at
 + *  once, but it is not clear what its behavior in this case is, and
 + *  no subclass of pkgAcquire::Item seems to actually use this
 + *  capability.
 + */
 +
 +/** \addtogroup acquire
 + *
 + *  @{
 + *
 + *  \file acquire.h
 + */
 +
  #ifndef PKGLIB_ACQUIRE_H
  #define PKGLIB_ACQUIRE_H
  
@@@ -72,23 -38,11 +72,20 @@@
  using std::vector;
  using std::string;
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/acquire.h"
- #endif 
  
  #include <sys/time.h>
  #include <unistd.h>
  
  class pkgAcquireStatus;
 +
 +/** \brief The core download scheduler.
 + *
 + *  This class represents an ongoing download.  It manages the lists
 + *  of active and pending downloads and handles setting up and tearing
 + *  down download-related structures.
 + *
 + *  \todo Why all the protected data items and methods?
 + */
  class pkgAcquire
  {   
     public:
@@@ -103,299 -57,97 +100,299 @@@
  
     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;
@@@ -405,141 -157,45 +402,141 @@@
        };
     };
     
 -   // Name of the queue
 +   /** \brief The name of this queue. */
     string Name;
  
 -   // Items queued into this queue
 +   /** \brief The head of the list of items contained in this queue.
 +    *
 +    *  \todo why a by-hand list instead of an STL structure?
 +    */
     QItem *Items;
 +
 +   /** \brief The head of the list of workers associated with this queue.
 +    *
 +    *  \todo This is plural because support exists in Queue for
 +    *  multiple workers.  However, it does not appear that there is
 +    *  any way to actually associate more than one worker with a
 +    *  queue.
 +    *
 +    *  \todo Why not just use a std::set?
 +    */
     pkgAcquire::Worker *Workers;
 +
 +   /** \brief the download scheduler with which this queue is associated. */
     pkgAcquire *Owner;
 +
 +   /** \brief The number of entries in this queue that are currently
 +    *  being downloaded.
 +    */
     signed long PipeDepth;
 +
 +   /** \brief The maximum number of entries that this queue will
 +    *  attempt to download at once.
 +    */
     unsigned long MaxPipeDepth;
     
     public:
     
 -   // Put an item into this queue
 +   /** \brief Insert the given fetch request into this queue. */
     void Enqueue(ItemDesc &Item);
 +
 +   /** \brief Remove all fetch requests for the given item from this queue.
 +    *
 +    *  \return \b true if at least one request was removed from the queue.
 +    */
     bool Dequeue(Item *Owner);
  
 -   // Find a Queued item
 +   /** \brief Locate an item in this queue.
 +    *
 +    *  \param URI A URI to match against.
 +    *  \param Owner A pkgAcquire::Worker to match against.
 +    *
 +    *  \return the first item in the queue whose URI is #URI and that
 +    *  is being downloaded by #Owner.
 +    */
     QItem *FindItem(string URI,pkgAcquire::Worker *Owner);
 +
 +   /** Presumably this should start downloading an item?
 +    *
 +    *  \todo Unimplemented.  Implement it or remove?
 +    */
     bool ItemStart(QItem *Itm,unsigned long Size);
 +
 +   /** \brief Remove the given item from this queue and set its state
 +    *  to pkgAcquire::Item::StatDone.
 +    *
 +    *  If this is the only queue containing the item, the item is also
 +    *  removed from the main queue by calling pkgAcquire::Dequeue.
 +    *
 +    *  \param Itm The item to remove.
 +    *
 +    *  \return \b true if no errors are encountered.
 +    */
     bool ItemDone(QItem *Itm);
     
 +   /** \brief Start the worker process associated with this queue.
 +    *
 +    *  If a worker process is already associated with this queue,
 +    *  this is equivalent to calling Cycle().
 +    *
 +    *  \return \b true if the startup was successful.
 +    */
     bool Startup();
 +
 +   /** \brief Shut down the worker process associated with this queue.
 +    *
 +    *  \param Final If \b true, then the process is stopped unconditionally.
 +    *               Otherwise, it is only stopped if it does not need cleanup
 +    *               as indicated by the pkgAcqMethod::NeedsCleanup member of
 +    *               its configuration.
 +    *
 +    *  \return \b true.
 +    */
     bool Shutdown(bool Final);
 +
 +   /** \brief Send idle items to the worker process.
 +    *
 +    *  Fills up the pipeline by inserting idle items into the worker's queue.
 +    */
     bool Cycle();
 +
 +   /** \brief Check for items that could be enqueued.
 +    *
 +    *  Call this after an item placed in multiple queues has gone from
 +    *  the pkgAcquire::Item::StatFetching state to the
 +    *  pkgAcquire::Item::StatIdle state, to possibly refill an empty queue.
 +    *  This is an alias for Cycle().
 +    *
 +    *  \todo Why both this and Cycle()?  Are they expected to be
 +    *  different someday?
 +    */
     void Bump();
     
 +   /** \brief Create a new Queue.
 +    *
 +    *  \param Name The name of the new queue.
 +    *  \param Owner The download process that owns the new queue.
 +    */
     Queue(string Name,pkgAcquire *Owner);
 +
 +   /** Shut down all the worker processes associated with this queue
 +    *  and empty the queue.
 +    */
     ~Queue();
  };
  
 +/** \brief Iterates over all the URIs being fetched by a pkgAcquire object. */
  class pkgAcquire::UriIterator
  {
 +   /** The next queue to iterate over. */
     pkgAcquire::Queue *CurQ;
 +   /** The item that we currently point at. */
     pkgAcquire::Queue::QItem *CurItem;
     
     public:
     
 -   // Advance to the next item
     inline void operator ++() {operator ++();};
 +
     void operator ++(int)
     {
        CurItem = CurItem->Next;
@@@ -550,14 -206,11 +547,14 @@@
        }
     };
     
 -   // 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)
@@@ -568,200 -221,61 +565,200 @@@
     }   
  };
  
 -// Configuration information from each method
 +/** \brief Information about the properties of a single acquire method. */
  struct pkgAcquire::MethodConfig
  {
 +   /** \brief The next link on the acquire method list.
 +    *
 +    *  \todo Why not an STL container?
 +    */
     MethodConfig *Next;
     
 +   /** \brief The name of this acquire method (e.g., http). */
     string Access;
  
 +   /** \brief The implementation version of this acquire method. */
     string Version;
 +
 +   /** \brief If \b true, only one download queue should be created for this
 +    *  method.
 +    */
     bool SingleInstance;
 +
 +   /** \brief If \b true, this method supports pipelined downloading. */
     bool Pipeline;
 +
 +   /** \brief If \b true, the worker process should send the entire
 +    *  APT configuration tree to the fetch subprocess when it starts
 +    *  up.
 +    */
     bool SendConfig;
 +
 +   /** \brief If \b true, this fetch method does not require network access;
 +    *  all files are to be acquired from the local disk.
 +    */
     bool LocalOnly;
 +
 +   /** \brief If \b true, the subprocess has to carry out some cleanup
 +    *  actions before shutting down.
 +    *
 +    *  For instance, the cdrom method needs to unmount the CD after it
 +    *  finishes.
 +    */
     bool NeedsCleanup;
 +
 +   /** \brief If \b true, this fetch method acquires files from removable media. */
     bool Removable;
     
 +   /** \brief Set up the default method parameters.
 +    *
 +    *  All fields are initialized to NULL, "", or \b false as
 +    *  appropriate.
 +    */
     MethodConfig();
  };
  
 +/** \brief A monitor object for downloads controlled by the pkgAcquire class.
 + *
 + *  \todo Why protected members?
 + *
 + *  \todo Should the double members be uint64_t?
 + */
  class pkgAcquireStatus
  {
     protected:
     
 +   /** \brief The last time at which this monitor object was updated. */
     struct timeval Time;
 +
 +   /** \brief The time at which the download started. */
     struct timeval StartTime;
 +
 +   /** \brief The number of bytes fetched as of the previous call to
 +    *  pkgAcquireStatus::Pulse, including local items.
 +    */
     double LastBytes;
 +
 +   /** \brief The current rate of download as of the most recent call
 +    *  to pkgAcquireStatus::Pulse, in bytes per second.
 +    */
     double CurrentCPS;
 +
 +   /** \brief The number of bytes fetched as of the most recent call
 +    *  to pkgAcquireStatus::Pulse, including local items.
 +    */
     double CurrentBytes;
 +
 +   /** \brief The total number of bytes that need to be fetched.
 +    *
 +    *  \warning This member is inaccurate, as new items might be
 +    *  enqueued while the download is in progress!
 +    */
     double TotalBytes;
 +
 +   /** \brief The total number of bytes accounted for by items that
 +    *  were successfully fetched.
 +    */
     double FetchedBytes;
 +
 +   /** \brief The amount of time that has elapsed since the download
 +    *   started.
 +    */
     unsigned long ElapsedTime;
 +
 +   /** \brief The total number of items that need to be fetched.
 +    *
 +    *  \warning This member is inaccurate, as new items might be
 +    *  enqueued while the download is in progress!
 +    */
     unsigned long TotalItems;
 +
 +   /** \brief The number of items that have been successfully downloaded. */
     unsigned long CurrentItems;
     
     public:
  
 +   /** \brief If \b true, the download scheduler should call Pulse()
 +    *  at the next available opportunity.
 +    */
     bool Update;
 +
 +   /** \brief If \b true, extra Pulse() invocations will be performed.
 +    *
 +    *  With this option set, Pulse() will be called every time that a
 +    *  download item starts downloading, finishes downloading, or
 +    *  terminates with an error.
 +    */
     bool MorePulses;
        
 -   // Called by items when they have finished a real download
 +   /** \brief Invoked when a local or remote file has been completely fetched.
 +    *
 +    *  \param Size The size of the file fetched.
 +    *
 +    *  \param ResumePoint How much of the file was already fetched.
 +    */
     virtual void Fetched(unsigned long Size,unsigned long ResumePoint);
     
 -   // Called to change media
 +   /** \brief Invoked when the user should be prompted to change the
 +    *         inserted removable media.
 +    *
 +    *  This method should not return until the user has confirmed to
 +    *  the user interface that the media change is complete.
 +    *
 +    *  \param Media The name of the media type that should be changed.
 +    *
 +    *  \param Drive The identifying name of the drive whose media
 +    *               should be changed.
 +    *
 +    *  \return \b true if the user confirms the media change, \b
 +    *  false if it is cancelled.
 +    *
 +    *  \todo This is a horrible blocking monster; it should be CPSed
 +    *  with prejudice.
 +    */
     virtual bool MediaChange(string Media,string Drive) = 0;
     
 -   // Each of these is called by the workers when an event occures
 +   /** \brief Invoked when an item is confirmed to be up-to-date.
 +
 +    * For instance, when an HTTP download is informed that the file on
 +    * the server was not modified.
 +    */
     virtual void IMSHit(pkgAcquire::ItemDesc &/*Itm*/) {};
 +
 +   /** \brief Invoked when some of an item's data is fetched. */
     virtual void Fetch(pkgAcquire::ItemDesc &/*Itm*/) {};
 +
 +   /** \brief Invoked when an item is successfully and completely fetched. */
     virtual void Done(pkgAcquire::ItemDesc &/*Itm*/) {};
 +
 +   /** \brief Invoked when the process of fetching an item encounters
 +    *  a fatal error.
 +    */
     virtual void Fail(pkgAcquire::ItemDesc &/*Itm*/) {};
 -   virtual bool Pulse(pkgAcquire *Owner); // returns false on user cancel
 +
 +   /** \brief Periodically invoked while the Acquire process is underway.
 +    *
 +    *  Subclasses should first call pkgAcquireStatus::Pulse(), then
 +    *  update their status output.  The download process is blocked
 +    *  while Pulse() is being called.
 +    *
 +    *  \return \b false if the user asked to cancel the whole Acquire process.
 +    *
 +    *  \see pkgAcquire::Run
 +    */
 +   virtual bool Pulse(pkgAcquire *Owner);
 +
 +   /** \brief Invoked when the Acquire process starts running. */
     virtual void Start();
 +
 +   /** \brief Invoked when the Acquire process stops running. */
     virtual void Stop();
     
 +   /** \brief Initialize all counters to 0 and the time to the current time. */
     pkgAcquireStatus();
     virtual ~pkgAcquireStatus() {};
  };
  
 +/** @} */
 +
  #endif
diff --combined apt-pkg/cacheiterators.h
index d5a9c7b0d,c412eaa97..08eafca0f
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@@ -31,9 -31,6 +31,6 @@@
  #ifndef PKGLIB_CACHEITERATORS_H
  #define PKGLIB_CACHEITERATORS_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/cacheiterators.h"
- #endif 
  
  // Package Iterator
  class pkgCache::PkgIterator
@@@ -99,7 -96,7 +96,7 @@@ class pkgCache::VerIterato
  {
     Version *Ver;
     pkgCache *Owner;
 -   
 +
     void _dummy();
     
     public:
@@@ -128,8 -125,6 +125,8 @@@
     inline const char *Section() const {return Ver->Section == 0?0:Owner->StrP + Ver->Section;};
     inline const char *Arch() const {return Ver->Arch == 0?0:Owner->StrP + Ver->Arch;};
     inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + Ver->ParentPkg);};
 +   inline DescIterator DescriptionList() const;
 +   DescIterator TranslatedDescription() const;
     inline DepIterator DependsList() const;
     inline PrvIterator ProvidesList() const;
     inline VerFileIterator FileList() const;
@@@ -150,50 -145,6 +147,50 @@@
     };
  };
  
 +// Description Iterator
 +class pkgCache::DescIterator
 +{
 +   Description *Desc;
 +   pkgCache *Owner;
 +   
 +   void _dummy();
 +   
 +   public:
 +
 +   // Iteration
 +   void operator ++(int) {if (Desc != Owner->DescP) Desc = Owner->DescP + Desc->NextDesc;};
 +   inline void operator ++() {operator ++(0);};
 +   inline bool end() const {return Desc == Owner->DescP?true:false;};
 +   inline void operator =(const DescIterator &B) {Desc = B.Desc; Owner = B.Owner;};
 +   
 +   // Comparison
 +   inline bool operator ==(const DescIterator &B) const {return Desc == B.Desc;};
 +   inline bool operator !=(const DescIterator &B) const {return Desc != B.Desc;};
 +   int CompareDesc(const DescIterator &B) const;
 +   
 +   // Accessors
 +   inline Description *operator ->() {return Desc;};
 +   inline Description const *operator ->() const {return Desc;};
 +   inline Description &operator *() {return *Desc;};
 +   inline Description const &operator *() const {return *Desc;};
 +   inline operator Description *() {return Desc == Owner->DescP?0:Desc;};
 +   inline operator Description const *() const {return Desc == Owner->DescP?0:Desc;};
 +   inline pkgCache *Cache() {return Owner;};
 +      
 +   inline const char *LanguageCode() const {return Owner->StrP + Desc->language_code;};
 +   inline const char *md5() const {return Owner->StrP + Desc->md5sum;};
 +   inline DescFileIterator FileList() const;
 +   inline unsigned long Index() const {return Desc - Owner->DescP;};
 +
 +   inline DescIterator() : Desc(0), Owner(0) {};   
 +   inline DescIterator(pkgCache &Owner,Description *Trg = 0) : Desc(Trg), 
 +              Owner(&Owner) 
 +   { 
 +      if (Desc == 0)
 +	 Desc = Owner.DescP;
 +   };
 +};
 +
  // Dependency iterator
  class pkgCache::DepIterator
  {
@@@ -384,38 -335,6 +381,38 @@@ class pkgCache::VerFileIterato
     inline VerFileIterator(pkgCache &Owner,VerFile *Trg) : Owner(&Owner), FileP(Trg) {};
  };
  
 +// Description File 
 +class pkgCache::DescFileIterator
 +{
 +   pkgCache *Owner;
 +   DescFile *FileP;
 +
 +   public:
 +
 +   // Iteration
 +   void operator ++(int) {if (FileP != Owner->DescFileP) FileP = Owner->DescFileP + FileP->NextFile;};
 +   inline void operator ++() {operator ++(0);};
 +   inline bool end() const {return FileP == Owner->DescFileP?true:false;};
 +
 +   // Comparison
 +   inline bool operator ==(const DescFileIterator &B) const {return FileP == B.FileP;};
 +   inline bool operator !=(const DescFileIterator &B) const {return FileP != B.FileP;};
 +			   
 +   // Accessors
 +   inline DescFile *operator ->() {return FileP;};
 +   inline DescFile const *operator ->() const {return FileP;};
 +   inline DescFile const &operator *() const {return *FileP;};
 +   inline operator DescFile *() {return FileP == Owner->DescFileP?0:FileP;};
 +   inline operator DescFile const *() const {return FileP == Owner->DescFileP?0:FileP;};
 +   inline pkgCache *Cache() {return Owner;};
 +  
 +   inline PkgFileIterator File() const {return PkgFileIterator(*Owner,FileP->File + Owner->PkgFileP);};
 +   inline unsigned long Index() const {return FileP - Owner->DescFileP;};
 +      
 +   inline DescFileIterator() : Owner(0), FileP(0) {};
 +   inline DescFileIterator(pkgCache &Owner,DescFile *Trg) : Owner(&Owner), FileP(Trg) {};
 +};
 +
  // Inlined Begin functions cant be in the class because of order problems
  inline pkgCache::VerIterator pkgCache::PkgIterator::VersionList() const
         {return VerIterator(*Owner,Owner->VerP + Pkg->VersionList);};
@@@ -425,15 -344,11 +422,15 @@@ inline pkgCache::DepIterator pkgCache::
         {return DepIterator(*Owner,Owner->DepP + Pkg->RevDepends,Pkg);};
  inline pkgCache::PrvIterator pkgCache::PkgIterator::ProvidesList() const
         {return PrvIterator(*Owner,Owner->ProvideP + Pkg->ProvidesList,Pkg);};
 +inline pkgCache::DescIterator pkgCache::VerIterator::DescriptionList() const
 +       {return DescIterator(*Owner,Owner->DescP + Ver->DescriptionList);};
  inline pkgCache::PrvIterator pkgCache::VerIterator::ProvidesList() const
         {return PrvIterator(*Owner,Owner->ProvideP + Ver->ProvidesList,Ver);};
  inline pkgCache::DepIterator pkgCache::VerIterator::DependsList() const
         {return DepIterator(*Owner,Owner->DepP + Ver->DependsList,Ver);};
  inline pkgCache::VerFileIterator pkgCache::VerIterator::FileList() const
         {return VerFileIterator(*Owner,Owner->VerFileP + Ver->FileList);};
 +inline pkgCache::DescFileIterator pkgCache::DescIterator::FileList() const
 +       {return DescFileIterator(*Owner,Owner->DescFileP + Desc->FileList);};
  
  #endif
diff --combined apt-pkg/cdrom.h
index e18aaff3e,b8b208c30..68d61c098
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@@ -5,9 -5,6 +5,6 @@@
  #include<string>
  #include<vector>
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/cdrom.h"
- #endif
  
  using namespace std;
  
@@@ -50,11 -47,8 +47,11 @@@ class pkgCdro
     };
  
  
 -   bool FindPackages(string CD,vector<string> &List,
 -		     vector<string> &SList, vector<string> &SigList,
 +   bool FindPackages(string CD,
 +		     vector<string> &List,
 +		     vector<string> &SList, 
 +		     vector<string> &SigList,
 +		     vector<string> &TransList,
  		     string &InfoDir, pkgCdromStatus *log,
  		     unsigned int Depth = 0);
     bool DropBinaryArch(vector<string> &List);
diff --combined apt-pkg/contrib/sha256.h
index 70b3ae2ad,01b638d56..c490bfa4d
--- a/apt-pkg/contrib/sha256.h
+++ b/apt-pkg/contrib/sha256.h
@@@ -14,12 -14,9 +14,8 @@@
  #ifndef APTPKG_SHA256_H
  #define APTPKG_SHA256_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/sha256.h"
- #endif 
- 
  #include <string>
  #include <algorithm>
 -#include <stdint.h>
  
  using std::string;
  using std::min;
diff --combined apt-pkg/contrib/strutl.h
index 254087267,b8553ab58..ae1244ecd
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@@ -16,9 -16,7 +16,7 @@@
  #ifndef STRUTL_H
  #define STRUTL_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/strutl.h"
- #endif 
+ 
  
  #include <stdlib.h>
  #include <string>
@@@ -38,8 -36,7 +36,8 @@@ using std::ostream
  #define APT_FORMAT2
  #define APT_FORMAT3
  #endif    
 -    
 +
 +bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest);
  char *_strstrip(char *String);
  char *_strtabexpand(char *String,size_t Len);
  bool ParseQuoteWord(const char *&String,string &Res);
diff --combined apt-pkg/deb/debindexfile.h
index 57005222f,2bc963567..b0012c96b
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@@ -16,9 -16,7 +16,7 @@@
  #ifndef PKGLIB_DEBINDEXFILE_H
  #define PKGLIB_DEBINDEXFILE_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/debindexfile.h"
- #endif
+ 
  
  #include <apt-pkg/indexfile.h>
  
@@@ -74,36 -72,6 +72,36 @@@ class debPackagesIndex : public pkgInde
     debPackagesIndex(string URI,string Dist,string Section,bool Trusted);
  };
  
 +class debTranslationsIndex : public pkgIndexFile
 +{
 +   string URI;
 +   string Dist;
 +   string Section;
 +   
 +   string Info(const char *Type) const;
 +   string IndexFile(const char *Type) const;
 +   string IndexURI(const char *Type) const;
 +
 +   inline string TranslationFile() const {return "Translation-" + LanguageCode();};
 +
 +   public:
 +   
 +   virtual const Type *GetType() const;
 +
 +   // Interface for acquire
 +   virtual string Describe(bool Short) const;   
 +   virtual bool GetIndexes(pkgAcquire *Owner) const;
 +   
 +   // Interface for the Cache Generator
 +   virtual bool Exists() const;
 +   virtual bool HasPackages() const;
 +   virtual unsigned long Size() const;
 +   virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const;
 +   virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 +
 +   debTranslationsIndex(string URI,string Dist,string Section);
 +};
 +
  class debSourcesIndex : public pkgIndexFile
  {
     string URI;
diff --combined apt-pkg/deb/debrecords.h
index 24e5aab88,3f1956164..fdf8d762b
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@@ -14,12 -14,7 +14,8 @@@
  #ifndef PKGLIB_DEBRECORDS_H
  #define PKGLIB_DEBRECORDS_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/debrecords.h"
- #endif 
- 
  #include <apt-pkg/pkgrecords.h>
 +#include <apt-pkg/indexfile.h>
  #include <apt-pkg/tagfile.h>
  
  class debRecordParser : public pkgRecords::Parser
@@@ -31,7 -26,6 +27,7 @@@
     protected:
     
     virtual bool Jump(pkgCache::VerFileIterator const &Ver);
 +   virtual bool Jump(pkgCache::DescFileIterator const &Desc);
     
     public:
  
diff --combined apt-pkg/deb/debsrcrecords.h
index f4e2cb46c,51e063812..55fdcb667
--- a/apt-pkg/deb/debsrcrecords.h
+++ b/apt-pkg/deb/debsrcrecords.h
@@@ -11,9 -11,6 +11,6 @@@
  #ifndef PKGLIB_DEBSRCRECORDS_H
  #define PKGLIB_DEBSRCRECORDS_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/debsrcrecords.h"
- #endif 
  
  #include <apt-pkg/srcrecords.h>
  #include <apt-pkg/tagfile.h>
@@@ -24,10 -21,9 +21,10 @@@ class debSrcRecordParser : public pkgSr
     FileFd Fd;
     pkgTagFile Tags;
     pkgTagSection Sect;
 -   char Buffer[10000];
     char *StaticBinList[400];
     unsigned long iOffset;
 +   char *Buffer;
 +   unsigned long BufSize;
     
     public:
  
@@@ -50,9 -46,10 +47,9 @@@
     };
     virtual bool Files(vector<pkgSrcRecords::File> &F);
  
 -   debSrcRecordParser(string File,pkgIndexFile const *Index) :
 -                   Parser(Index),      
 -                   Fd(File,FileFd::ReadOnly),
 -                   Tags(&Fd,102400) {};
 +   debSrcRecordParser(string File,pkgIndexFile const *Index) 
 +      : Parser(Index), Fd(File,FileFd::ReadOnly), Tags(&Fd,102400), 
 +        Buffer(0), BufSize(0) {}
  };
  
  #endif
diff --combined apt-pkg/deb/dpkgpm.h
index 0b181dc43,45eb6b15b..7da729904
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@@ -10,10 -10,6 +10,6 @@@
  #ifndef PKGLIB_DPKGPM_H
  #define PKGLIB_DPKGPM_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/dpkgpm.h"
- #endif
- 
  #include <apt-pkg/packagemanager.h>
  #include <vector>
  #include <stdio.h>
@@@ -47,7 -43,7 +43,7 @@@ class pkgDPkgPM : public pkgPackageMana
     bool RunScripts(const char *Cnf);
     bool RunScriptsWithPkgs(const char *Cnf);
     bool SendV2Pkgs(FILE *F);
 -   
 +
     // The Actuall installation implementation
     virtual bool Install(PkgIterator Pkg,string File);
     virtual bool Configure(PkgIterator Pkg);
diff --combined apt-pkg/depcache.cc
index 0a364f6ca,70bc9f086..6d74a4db5
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@@ -8,60 -8,21 +8,57 @@@
     ##################################################################### */
  									/*}}}*/
  // Include Files							/*{{{*/
- #ifdef __GNUG__
- #pragma implementation "apt-pkg/depcache.h"
- #endif
  #include <apt-pkg/depcache.h>
  #include <apt-pkg/version.h>
  #include <apt-pkg/error.h>
  #include <apt-pkg/sptr.h>
  #include <apt-pkg/algorithms.h>
 +
 +#include <apt-pkg/fileutl.h>
  #include <apt-pkg/configuration.h>
 +#include <apt-pkg/pkgsystem.h>
 +#include <apt-pkg/tagfile.h>
 +
 +#include <iostream>
 +#include <sstream>    
 +#include <set>
  
  #include <apti18n.h>    
 -									/*}}}*/
 +
 +pkgDepCache::ActionGroup::ActionGroup(pkgDepCache &cache) :
 +  cache(cache), released(false)
 +{
 +  ++cache.group_level;
 +}
 +
 +void pkgDepCache::ActionGroup::release()
 +{
 +  if(!released)
 +    {
 +      if(cache.group_level == 0)
 +	std::cerr << "W: Unbalanced action groups, expect badness" << std::endl;
 +      else
 +	{
 +	  --cache.group_level;
 +
 +	  if(cache.group_level == 0)
 +	    cache.MarkAndSweep();
 +	}
 +
 +      released = false;
 +    }
 +}
 +
 +pkgDepCache::ActionGroup::~ActionGroup()
 +{
 +  release();
 +}
  
  // DepCache::pkgDepCache - Constructors					/*{{{*/
  // ---------------------------------------------------------------------
  /* */
  pkgDepCache::pkgDepCache(pkgCache *pCache,Policy *Plcy) :
 -                Cache(pCache), PkgState(0), DepState(0)
 +  group_level(0), Cache(pCache), PkgState(0), DepState(0)
  {
     delLocalPolicy = 0;
     LocalPolicy = Plcy;
@@@ -84,10 -45,6 +81,10 @@@ pkgDepCache::~pkgDepCache(
  /* This allocats the extension buffers and initializes them. */
  bool pkgDepCache::Init(OpProgress *Prog)
  {
 +   // Suppress mark updates during this operation (just in case) and
 +   // run a mark operation when Init terminates.
 +   ActionGroup actions(*this);
 +
     delete [] PkgState;
     delete [] DepState;
     PkgState = new StateCache[Head().PackageCount];
@@@ -113,7 -70,7 +110,7 @@@
        // Find the proper cache slot
        StateCache &State = PkgState[I->ID];
        State.iFlags = 0;
 -      
 +
        // Figure out the install version
        State.CandidateVer = GetCandidateVer(I);
        State.InstallVer = I.CurrentVer();
@@@ -135,130 -92,11 +132,130 @@@
  
     if(Prog != 0)
        Prog->Done();
 -   
 +
     return true;
  } 
  									/*}}}*/
  
 +bool pkgDepCache::readStateFile(OpProgress *Prog)
 +{
 +   FileFd state_file;
 +   string state = _config->FindDir("Dir::State") + "extended_states";
 +   if(FileExists(state)) {
 +      state_file.Open(state, FileFd::ReadOnly);
 +      int file_size = state_file.Size();
 +      if(Prog != NULL)
 +	 Prog->OverallProgress(0, file_size, 1, 
 +			       _("Reading state information"));
 +
 +      pkgTagFile tagfile(&state_file);
 +      pkgTagSection section;
 +      int amt=0;
 +      while(tagfile.Step(section)) {
 +	 string pkgname = section.FindS("Package");
 +	 pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname);
 +	 // Silently ignore unknown packages and packages with no actual
 +	 // version.
 +	 if(!pkg.end() && !pkg.VersionList().end()) {
 +	    short reason = section.FindI("Auto-Installed", 0);
 +	    if(reason > 0)
 +	       PkgState[pkg->ID].Flags  |= Flag::Auto;
 +	    if(_config->FindB("Debug::pkgAutoRemove",false))
 +	       std::cout << "Auto-Installed : " << pkgname << std::endl;
 +	    amt+=section.size();
 +	    if(Prog != NULL)
 +	       Prog->OverallProgress(amt, file_size, 1, 
 +				     _("Reading state information"));
 +	 }
 +	 if(Prog != NULL)
 +	    Prog->OverallProgress(file_size, file_size, 1, 
 +				  _("Reading state information"));
 +      }
 +   }
 +
 +   return true;
 +}
 +
 +bool pkgDepCache::writeStateFile(OpProgress *prog)
 +{
 +   if(_config->FindB("Debug::pkgAutoRemove",false))
 +      std::clog << "pkgDepCache::writeStateFile()" << std::endl;
 +
 +   FileFd StateFile;
 +   string state = _config->FindDir("Dir::State") + "extended_states";
 +
 +   // if it does not exist, create a empty one
 +   if(!FileExists(state)) 
 +   {
 +      StateFile.Open(state, FileFd::WriteEmpty);
 +      StateFile.Close();
 +   }
 +
 +   // open it
 +   if(!StateFile.Open(state, FileFd::ReadOnly))
 +      return _error->Error(_("Failed to open StateFile %s"),
 +			   state.c_str());
 +
 +   FILE *OutFile;
 +   string outfile = state + ".tmp";
 +   if((OutFile = fopen(outfile.c_str(),"w")) == NULL)
 +      return _error->Error(_("Failed to write temporary StateFile %s"),
 +			   outfile.c_str());
 +
 +   // first merge with the existing sections
 +   pkgTagFile tagfile(&StateFile);
 +   pkgTagSection section;
 +   std::set<string> pkgs_seen;
 +   const char *nullreorderlist[] = {0};
 +   while(tagfile.Step(section)) {
 +	 string pkgname = section.FindS("Package");
 +	 // Silently ignore unknown packages and packages with no actual
 +	 // version.
 +	 pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname);
 +	 if(pkg.end() || pkg.VersionList().end()) 
 +	    continue;
 +	 bool oldAuto = section.FindI("Auto-Installed");
 +	 bool newAuto = (PkgState[pkg->ID].Flags & Flag::Auto);
 +	 if(_config->FindB("Debug::pkgAutoRemove",false))
 +	    std::clog << "Update exisiting AutoInstall info: " 
 +		      << pkg.Name() << std::endl;
 +	 TFRewriteData rewrite[2];
 +	 rewrite[0].Tag = "Auto-Installed";
 +	 rewrite[0].Rewrite = newAuto ? "1" : "0";
 +	 rewrite[0].NewTag = 0;
 +	 rewrite[1].Tag = 0;
 +	 TFRewrite(OutFile, section, nullreorderlist, rewrite);
 +	 fprintf(OutFile,"\n");
 +	 pkgs_seen.insert(pkgname);
 +   }
 +   
 +   // then write the ones we have not seen yet
 +   std::ostringstream ostr;
 +   for(pkgCache::PkgIterator pkg=Cache->PkgBegin(); !pkg.end(); pkg++) {
 +      if(PkgState[pkg->ID].Flags & Flag::Auto) {
 +	 if (pkgs_seen.find(pkg.Name()) != pkgs_seen.end()) {
 +	    if(_config->FindB("Debug::pkgAutoRemove",false))
 +	       std::clog << "Skipping already written " << pkg.Name() << std::endl;
 +	    continue;
 +	 }
 +	 if(_config->FindB("Debug::pkgAutoRemove",false))
 +	    std::clog << "Writing new AutoInstall: " 
 +		      << pkg.Name() << std::endl;
 +	 ostr.str(string(""));
 +	 ostr << "Package: " << pkg.Name() 
 +	      << "\nAuto-Installed: 1\n\n";
 +	 fprintf(OutFile,ostr.str().c_str());
 +	 fprintf(OutFile,"\n");
 +      }
 +   }
 +   fclose(OutFile);
 +
 +   // move the outfile over the real file
 +   rename(outfile.c_str(), state.c_str());
 +
 +   return true;
 +}
 +
  // DepCache::CheckDep - Checks a single dependency			/*{{{*/
  // ---------------------------------------------------------------------
  /* This first checks the dependency against the main target package and
@@@ -399,11 -237,9 +396,11 @@@ void pkgDepCache::AddStates(const PkgIt
  {
     StateCache &State = PkgState[Pkg->ID];
     
 -   // The Package is broken
 +   // The Package is broken (either minimal dep or policy dep)
     if ((State.DepState & DepInstMin) != DepInstMin)
        iBrokenCount += Add;
 +   if ((State.DepState & DepInstPolicy) != DepInstPolicy)
 +      iPolicyBrokenCount += Add;
     
     // Bad state
     if (Pkg.State() != PkgIterator::NeedsNothing)
@@@ -614,14 -450,12 +611,14 @@@ void pkgDepCache::Update(OpProgress *Pr
  
     if (Prog != 0)      
        Prog->Progress(Done);
 +
 +   readStateFile(Prog);
  }
  									/*}}}*/
  // DepCache::Update - Update the deps list of a package	   		/*{{{*/
  // ---------------------------------------------------------------------
  /* This is a helper for update that only does the dep portion of the scan. 
 -   It is mainly ment to scan reverse dependencies. */
 +   It is mainly meant to scan reverse dependencies. */
  void pkgDepCache::Update(DepIterator D)
  {
     // Update the reverse deps
@@@ -673,7 -507,7 +670,7 @@@ void pkgDepCache::Update(PkgIterator co
  // DepCache::MarkKeep - Put the package in the keep state		/*{{{*/
  // ---------------------------------------------------------------------
  /* */
 -void pkgDepCache::MarkKeep(PkgIterator const &Pkg,bool Soft)
 +void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser)
  {
     // Simplifies other routines.
     if (Pkg.end() == true)
@@@ -685,9 -519,6 +682,9 @@@
         Pkg.CurrentVer().Downloadable() == false)
        return;
     
 +   /** \todo Can this be moved later in the method? */
 +   ActionGroup group(*this);
 +
     /* We changed the soft state all the time so the UI is a bit nicer
        to use */
     StateCache &P = PkgState[Pkg->ID];
@@@ -703,17 -534,8 +700,17 @@@
     // We dont even try to keep virtual packages..
     if (Pkg->VersionList == 0)
        return;
 -   
 -   P.Flags &= ~Flag::Auto;
 +#if 0 // reseting the autoflag here means we lose the 
 +      // auto-mark information if a user selects a package for removal
 +      // but changes  his mind then and sets it for keep again
 +      // - this makes sense as default when all Garbage dependencies
 +      //   are automatically marked for removal (as aptitude does).
 +      //   setting a package for keep then makes it no longer autoinstalled
 +      //   for all other use-case this action is rather suprising
 +   if(FromUser && !P.Marked)
 +     P.Flags &= ~Flag::Auto;
 +#endif
 +
     RemoveSizes(Pkg);
     RemoveStates(Pkg);
  
@@@ -739,8 -561,6 +736,8 @@@ void pkgDepCache::MarkDelete(PkgIterato
     if (Pkg.end() == true)
        return;
  
 +   ActionGroup group(*this);
 +
     // Check that it is not already marked for delete
     StateCache &P = PkgState[Pkg->ID];
     P.iFlags &= ~(AutoKept | Purge);
@@@ -763,6 -583,7 +760,6 @@@
     else
        P.Mode = ModeDelete;
     P.InstallVer = 0;
 -   P.Flags &= Flag::Auto;
  
     AddStates(Pkg);   
     Update(Pkg);
@@@ -773,8 -594,7 +770,8 @@@
  // ---------------------------------------------------------------------
  /* */
  void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 -			      unsigned long Depth)
 +			      unsigned long Depth, bool FromUser,
 +			      bool ForceImportantDeps)
  {
     if (Depth > 100)
        return;
@@@ -783,27 -603,26 +780,27 @@@
     if (Pkg.end() == true)
        return;
     
 +   ActionGroup group(*this);
 +
     /* Check that it is not already marked for install and that it can be 
        installed */
     StateCache &P = PkgState[Pkg->ID];
     P.iFlags &= ~AutoKept;
 -   if (P.InstBroken() == false && (P.Mode == ModeInstall ||
 +   if ((P.InstPolicyBroken() == false && P.InstBroken() == false) && 
 +       (P.Mode == ModeInstall ||
  	P.CandidateVer == (Version *)Pkg.CurrentVer()))
     {
        if (P.CandidateVer == (Version *)Pkg.CurrentVer() && P.InstallVer == 0)
 -	 MarkKeep(Pkg);
 +	 MarkKeep(Pkg, false, FromUser);
        return;
     }
  
     // See if there is even any possible instalation candidate
     if (P.CandidateVer == 0)
        return;
 -   
     // We dont even try to install virtual packages..
     if (Pkg->VersionList == 0)
        return;
 -   
     /* Target the candidate version and remove the autoflag. We reset the
        autoflag below if this was called recursively. Otherwise the user
        should have the ability to de-auto a package by changing its state */
@@@ -812,20 -631,7 +809,20 @@@
     
     P.Mode = ModeInstall;
     P.InstallVer = P.CandidateVer;
 -   P.Flags &= ~Flag::Auto;
 +
 +   if(FromUser)
 +     {
 +       // Set it to manual if it's a new install or cancelling the
 +       // removal of a garbage package.
 +       if(P.Status == 2 || (!Pkg.CurrentVer().end() && !P.Marked))
 +	 P.Flags &= ~Flag::Auto;
 +     }
 +   else
 +     {
 +       // Set it to auto if this is a new install.
 +       if(P.Status == 2)
 +	 P.Flags |= Flag::Auto;
 +     }
     if (P.CandidateVer == (Version *)Pkg.CurrentVer())
        P.Mode = ModeKeep;
         
@@@ -857,43 -663,10 +854,43 @@@
  
        /* Check if this dep should be consider for install. If it is a user
           defined important dep and we are installed a new package then 
 -	 it will be installed. Otherwise we only worry about critical deps */
 +	 it will be installed. Otherwise we only check for important
 +         deps that have changed from the installed version
 +      */
        if (IsImportantDep(Start) == false)
  	 continue;
 -      if (Pkg->CurrentVer != 0 && Start.IsCritical() == false)
 +      
 +      /* check if any ImportantDep() (but not Critial) where added
 +       * since we installed the package
 +       */
 +      bool isNewImportantDep = false;
 +      if(!ForceImportantDeps && !Start.IsCritical())
 +      {
 +	 bool found=false;
 +	 VerIterator instVer = Pkg.CurrentVer();
 +	 if(!instVer.end())
 +	 {
 +	    for (DepIterator D = instVer.DependsList(); D.end() != true; D++)
 +	    {
 +	       //FIXME: deal better with or-groups(?)
 +	       DepIterator LocalStart = D;
 +	       
 +	       if(IsImportantDep(D) && Start.TargetPkg() == D.TargetPkg())
 +		  found=true;
 +	    }
 +	    // this is a new dep if it was not found to be already
 +	    // a important dep of the installed pacakge
 +	    isNewImportantDep = !found;
 +	 }
 +      }
 +      if(isNewImportantDep)
 +	 if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true)
 +	    std::clog << "new important dependency: " 
 +		      << Start.TargetPkg().Name() << std::endl;
 +
 +      // skip important deps if the package is already installed
 +      if (Pkg->CurrentVer != 0 && Start.IsCritical() == false 
 +	  && !isNewImportantDep && !ForceImportantDeps)
  	 continue;
        
        /* If we are in an or group locate the first or that can 
@@@ -935,14 -708,19 +932,14 @@@
  	    }
  	 }
  	 
 -	 if (InstPkg.end() == false)
 +	 if (InstPkg.end() == false) 
  	 {
  	    if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true)
  	       std::clog << "Installing " << InstPkg.Name() 
  			 << " as dep of " << Pkg.Name() 
  			 << std::endl;
 -	    MarkInstall(InstPkg,true,Depth + 1);
 -
 -	    // Set the autoflag, after MarkInstall because MarkInstall unsets it
 -	    if (P->CurrentVer == 0)
 -	       PkgState[InstPkg->ID].Flags |= Flag::Auto;
 +	   MarkInstall(InstPkg, true, Depth + 1, false, ForceImportantDeps);
  	 }
 -	 
  	 continue;
        }
        
@@@ -956,6 -734,7 +953,6 @@@
  	    PkgIterator Pkg = Ver.ParentPkg();
        
  	    MarkDelete(Pkg);
 -	    PkgState[Pkg->ID].Flags |= Flag::Auto;
  	 }
  	 continue;
        }      
@@@ -967,8 -746,6 +964,8 @@@
  /* */
  void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To)
  {
 +   ActionGroup group(*this);
 +
     RemoveSizes(Pkg);
     RemoveStates(Pkg);
     
@@@ -987,11 -764,9 +984,11 @@@
  /* */
  void pkgDepCache::SetCandidateVersion(VerIterator TargetVer)
  {
 +   ActionGroup group(*this);
 +
     pkgCache::PkgIterator Pkg = TargetVer.ParentPkg();
     StateCache &P = PkgState[Pkg->ID];
 -   
 +
     RemoveSizes(Pkg);
     RemoveStates(Pkg);
  
@@@ -1004,18 -779,6 +1001,18 @@@
     Update(Pkg);
     AddSizes(Pkg);
  }
 +
 +void pkgDepCache::MarkAuto(const PkgIterator &Pkg, bool Auto)
 +{
 +  StateCache &state = PkgState[Pkg->ID];
 +
 +  ActionGroup group(*this);
 +
 +  if(Auto)
 +    state.Flags |= Flag::Auto;
 +  else
 +    state.Flags &= ~Flag::Auto;
 +}
  									/*}}}*/
  // StateCache::Update - Compute the various static display things	/*{{{*/
  // ---------------------------------------------------------------------
@@@ -1103,239 -866,6 +1100,239 @@@ pkgCache::VerIterator pkgDepCache::Poli
  /* */
  bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep)
  {
 -   return Dep.IsCritical();
 +   if(Dep.IsCritical())
 +      return true;
 +   else if(Dep->Type == pkgCache::Dep::Recommends) 
 +   {
 +      if ( _config->FindB("APT::Install-Recommends", false))
 +	 return true;
 +      // we suport a special mode to only install-recommends for certain
 +      // sections
 +      // FIXME: this is a meant as a temporarly solution until the 
 +      //        recommends are cleaned up
 +      string s = _config->Find("APT::Install-Recommends-Section","");
 +      if(s.size() > 0) 
 +      {
 +	 const char *sec = Dep.TargetPkg().Section();
 +	 if (sec && strcmp(sec, s.c_str()) == 0)
 +	    return true;
 +      }
 +   }
 +   else if(Dep->Type == pkgCache::Dep::Suggests)
 +     return _config->FindB("APT::Install-Suggests", false);
 +
 +   return false;
  }
  									/*}}}*/
 +
 +pkgDepCache::DefaultRootSetFunc::DefaultRootSetFunc()
 +  : constructedSuccessfully(false)
 +{
 +  Configuration::Item const *Opts;
 +  Opts = _config->Tree("APT::NeverAutoRemove");
 +  if (Opts != 0 && Opts->Child != 0)
 +    {
 +      Opts = Opts->Child;
 +      for (; Opts != 0; Opts = Opts->Next)
 +	{
 +	  if (Opts->Value.empty() == true)
 +	    continue;
 +
 +	  regex_t *p = new regex_t;
 +	  if(regcomp(p,Opts->Value.c_str(),
 +		     REG_EXTENDED | REG_ICASE | REG_NOSUB) != 0)
 +	    {
 +	      regfree(p);
 +	      delete p;
 +	      _error->Error("Regex compilation error for APT::NeverAutoRemove");
 +	      return;
 +	    }
 +
 +	  rootSetRegexp.push_back(p);
 +	}
 +    }
 +
 +  constructedSuccessfully = true;
 +}
 +
 +pkgDepCache::DefaultRootSetFunc::~DefaultRootSetFunc()
 +{
 +  for(unsigned int i = 0; i < rootSetRegexp.size(); i++)
 +    {
 +      regfree(rootSetRegexp[i]);
 +      delete rootSetRegexp[i];
 +    }
 +}
 +
 +
 +bool pkgDepCache::DefaultRootSetFunc::InRootSet(const pkgCache::PkgIterator &pkg)
 +{
 +   for(unsigned int i = 0; i < rootSetRegexp.size(); i++)
 +      if (regexec(rootSetRegexp[i], pkg.Name(), 0, 0, 0) == 0)
 +	 return true;
 +
 +   return false;
 +}
 +
 +pkgDepCache::InRootSetFunc *pkgDepCache::GetRootSetFunc()
 +{
 +  DefaultRootSetFunc *f = new DefaultRootSetFunc;
 +  if(f->wasConstructedSuccessfully())
 +    return f;
 +  else
 +    {
 +      delete f;
 +      return NULL;
 +    }
 +}
 +
 +bool pkgDepCache::MarkFollowsRecommends()
 +{
 +  return _config->FindB("APT::AutoRemove::RecommendsImportant", true);
 +}
 +
 +bool pkgDepCache::MarkFollowsSuggests()
 +{
 +  return _config->FindB("APT::AutoRemove::SuggestsImportant", false);
 +}
 +
 +// the main mark algorithm
 +bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc)
 +{
 +   bool follow_recommends;
 +   bool follow_suggests;
 +
 +   // init the states
 +   for(PkgIterator p = PkgBegin(); !p.end(); ++p)
 +   {
 +      PkgState[p->ID].Marked  = false;
 +      PkgState[p->ID].Garbage = false;
 +
 +      // debug output
 +      if(_config->FindB("Debug::pkgAutoRemove",false) 
 +	 && PkgState[p->ID].Flags & Flag::Auto)
 +  	 std::clog << "AutoDep: " << p.Name() << std::endl;
 +   }
 +
 +   // init vars
 +   follow_recommends = MarkFollowsRecommends();
 +   follow_suggests   = MarkFollowsSuggests();
 +
 +
 +
 +   // do the mark part, this is the core bit of the algorithm
 +   for(PkgIterator p = PkgBegin(); !p.end(); ++p)
 +   {
 +      if(!(PkgState[p->ID].Flags & Flag::Auto) ||
 +	  (p->Flags & Flag::Essential) ||
 +	  userFunc.InRootSet(p))
 +          
 +      {
 +	 // the package is installed (and set to keep)
 +	 if(PkgState[p->ID].Keep() && !p.CurrentVer().end())
 +	    MarkPackage(p, p.CurrentVer(),
 +			follow_recommends, follow_suggests);
 +	 // the package is to be installed 
 +	 else if(PkgState[p->ID].Install())
 +	    MarkPackage(p, PkgState[p->ID].InstVerIter(*this),
 +			follow_recommends, follow_suggests);
 +      }
 +   }
 +
 +   return true;
 +}
 +
 +// mark a single package in Mark-and-Sweep
 +void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg,
 +			      const pkgCache::VerIterator &ver,
 +			      bool follow_recommends,
 +			      bool follow_suggests)
 +{
 +   pkgDepCache::StateCache &state = PkgState[pkg->ID];
 +   VerIterator candver            = state.CandidateVerIter(*this);
 +   VerIterator instver            = state.InstVerIter(*this);
 +
 +#if 0
 +   // If a package was garbage-collected but is now being marked, we
 +   // should re-select it 
 +   // For cases when a pkg is set to upgrade and this trigger the
 +   // removal of a no-longer used dependency.  if the pkg is set to
 +   // keep again later it will result in broken deps
 +   if(state.Delete() && state.RemoveReason = Unused) 
 +   {
 +      if(ver==candver)
 +	 mark_install(pkg, false, false, NULL);
 +      else if(ver==pkg.CurrentVer())
 +	 MarkKeep(pkg, false, false);
 +      
 +      instver=state.InstVerIter(*this);
 +   }
 +#endif
 +
 +   // Ignore versions other than the InstVer, and ignore packages
 +   // that are already going to be removed or just left uninstalled.
 +   if(!(ver == instver && !instver.end()))
 +      return;
 +
 +   // if we are marked already we are done
 +   if(state.Marked)
 +      return;
 +
 +   //std::cout << "Setting Marked for: " << pkg.Name() << std::endl;
 +   state.Marked=true;
 +
 +   if(!ver.end())
 +   {
 +     for(DepIterator d = ver.DependsList(); !d.end(); ++d)
 +     {
 +	if(d->Type == Dep::Depends ||
 +	   d->Type == Dep::PreDepends ||
 +	   (follow_recommends &&
 +	    d->Type == Dep::Recommends) ||
 +	   (follow_suggests &&
 +	    d->Type == Dep::Suggests))
 +        {
 +	   // Try all versions of this package.
 +	   for(VerIterator V = d.TargetPkg().VersionList(); 
 +	       !V.end(); ++V)
 +	   {
 +	      if(_system->VS->CheckDep(V.VerStr(), d->CompareOp, d.TargetVer()))
 +	      {
 +		 MarkPackage(V.ParentPkg(), V, 
 +			     follow_recommends, follow_suggests);
 +	      }
 +	   }
 +	   // Now try virtual packages
 +	   for(PrvIterator prv=d.TargetPkg().ProvidesList(); 
 +	       !prv.end(); ++prv)
 +	   {
 +	      if(_system->VS->CheckDep(prv.ProvideVersion(), d->CompareOp, 
 +				       d.TargetVer()))
 +	      {
 +		 MarkPackage(prv.OwnerPkg(), prv.OwnerVer(),
 +			     follow_recommends, follow_suggests);
 +	      }
 +	   }
 +	}
 +     }
 +   }
 +}
 +
 +bool pkgDepCache::Sweep()
 +{
 +   // do the sweep
 +   for(PkgIterator p=PkgBegin(); !p.end(); ++p)
 +  {
 +     StateCache &state=PkgState[p->ID];
 +
 +     // if it is not marked and it is installed, it's garbage 
 +     if(!state.Marked && (!p.CurrentVer().end() || state.Install()))
 +     {
 +	state.Garbage=true;
 +	if(_config->FindB("Debug::pkgAutoRemove",false))
 +	   std::cout << "Garbage: " << p.Name() << std::endl;
 +     }
 +  }   
 +
 +   return true;
 +}
diff --combined apt-pkg/depcache.h
index 5cd5ea354,929fe93c9..b2bcfb58a
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@@ -1,4 -1,4 +1,4 @@@
 -// -*- mode: cpp; mode: fold -*-
 +// -*- mode: c++; mode: fold -*-
  // Description								/*{{{*/
  // $Id: depcache.h,v 1.14 2001/02/20 07:03:17 jgg Exp $
  /* ######################################################################
@@@ -38,78 -38,13 +38,75 @@@
  #ifndef PKGLIB_DEPCACHE_H
  #define PKGLIB_DEPCACHE_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/depcache.h"
- #endif
  
  #include <apt-pkg/pkgcache.h>
  #include <apt-pkg/progress.h>
  
 +#include <regex.h>
 +
 +#include <vector>
 +
  class pkgDepCache : protected pkgCache::Namespace
  {
     public:
 +
 +   /** \brief An arbitrary predicate on packages. */
 +   class InRootSetFunc
 +   {
 +   public:
 +     virtual bool InRootSet(const pkgCache::PkgIterator &pkg) {return false;};
 +     virtual ~InRootSetFunc() {};
 +   };
 +
 +   private:
 +   /** \brief Mark a single package and all its unmarked important
 +    *  dependencies during mark-and-sweep.
 +    *
 +    *  Recursively invokes itself to mark all dependencies of the
 +    *  package.
 +    *
 +    *  \param pkg The package to mark.
 +    *
 +    *  \param ver The version of the package that is to be marked.
 +    *
 +    *  \param follow_recommends If \b true, recommendations of the
 +    *  package will be recursively marked.
 +    *
 +    *  \param follow_suggests If \b true, suggestions of the package
 +    *  will be recursively marked.
 +    */
 +   void MarkPackage(const pkgCache::PkgIterator &pkg,
 +		    const pkgCache::VerIterator &ver,
 +		    bool follow_recommends,
 +		    bool follow_suggests);
 +
 +   /** \brief Update the Marked field of all packages.
 +    *
 +    *  Each package's StateCache::Marked field will be set to \b true
 +    *  if and only if it can be reached from the root set.  By
 +    *  default, the root set consists of the set of manually installed
 +    *  or essential packages, but it can be extended using the
 +    *  parameter #rootFunc.
 +    *
 +    *  \param rootFunc A callback that can be used to add extra
 +    *  packages to the root set.
 +    *
 +    *  \return \b false if an error occured.
 +    */
 +   bool MarkRequired(InRootSetFunc &rootFunc);
 +
 +   /** \brief Set the StateCache::Garbage flag on all packages that
 +    *  should be removed.
 +    *
 +    *  Packages that were not marked by the last call to #MarkRequired
 +    *  are tested to see whether they are actually garbage.  If so,
 +    *  they are marked as such.
 +    *
 +    *  \return \b false if an error occured.
 +    */
 +   bool Sweep();
 +
 +   public:
     
     // These flags are used in DepState
     enum DepFlags {DepNow = (1 << 0),DepInstall = (1 << 1),DepCVer = (1 << 2),
@@@ -125,84 -60,6 +122,84 @@@
        
     enum VersionTypes {NowVersion, InstallVersion, CandidateVersion};
     enum ModeList {ModeDelete = 0, ModeKeep = 1, ModeInstall = 2};
 +
 +   /** \brief Represents an active action group.
 +    *
 +    *  An action group is a group of actions that are currently being
 +    *  performed.  While an active group is active, certain routine
 +    *  clean-up actions that would normally be performed after every
 +    *  cache operation are delayed until the action group is
 +    *  completed.  This is necessary primarily to avoid inefficiencies
 +    *  when modifying a large number of packages at once.
 +    *
 +    *  This class represents an active action group.  Creating an
 +    *  instance will create an action group; destroying one will
 +    *  destroy the corresponding action group.
 +    *
 +    *  The following operations are suppressed by this class:
 +    *
 +    *    - Keeping the Marked and Garbage flags up to date.
 +    *
 +    *  \note This can be used in the future to easily accumulate
 +    *  atomic actions for undo or to display "what apt did anyway";
 +    *  e.g., change the counter of how many action groups are active
 +    *  to a std::set of pointers to them and use those to store
 +    *  information about what happened in a group in the group.
 +    */
 +   class ActionGroup
 +   {
 +       pkgDepCache &cache;
 +
 +       bool released;
 +
 +       /** Action groups are noncopyable. */
 +       ActionGroup(const ActionGroup &other);
 +   public:
 +       /** \brief Create a new ActionGroup.
 +	*
 +	*  \param cache The cache that this ActionGroup should
 +	*  manipulate.
 +	*
 +	*  As long as this object exists, no automatic cleanup
 +	*  operations will be undertaken.
 +	*/
 +       ActionGroup(pkgDepCache &cache);
 +
 +       /** \brief Clean up the action group before it is destroyed.
 +        *
 +        *  If it is destroyed later, no second cleanup wil be run.
 +	*/
 +       void release();
 +
 +       /** \brief Destroy the action group.
 +	*
 +	*  If this is the last action group, the automatic cache
 +	*  cleanup operations will be undertaken.
 +	*/
 +       ~ActionGroup();
 +   };
 +
 +   /** \brief Returns \b true for packages matching a regular
 +    *  expression in APT::NeverAutoRemove.
 +    */
 +   class DefaultRootSetFunc : public InRootSetFunc
 +   {
 +     std::vector<regex_t *> rootSetRegexp;
 +     bool constructedSuccessfully;
 +
 +   public:
 +     DefaultRootSetFunc();
 +     ~DefaultRootSetFunc();
 +
 +     /** \return \b true if the class initialized successfully, \b
 +      *  false otherwise.  Used to avoid throwing an exception, since
 +      *  APT classes generally don't.
 +      */
 +     bool wasConstructedSuccessfully() const { return constructedSuccessfully; }
 +
 +     bool InRootSet(const pkgCache::PkgIterator &pkg);
 +   };
 +
     struct StateCache
     {
        // Epoch stripped text versions of the two version fields
@@@ -219,17 -76,6 +216,17 @@@
        unsigned short Flags;
        unsigned short iFlags;           // Internal flags
  
 +      /** \brief \b true if this package can be reached from the root set. */
 +      bool Marked;
 +
 +      /** \brief \b true if this package is unused and should be removed.
 +       *
 +       *  This differs from !#Marked, because it is possible that some
 +       *  unreachable packages will be protected from becoming
 +       *  garbage.
 +       */
 +      bool Garbage;
 +
        // Various tree indicators
        signed char Status;              // -1,0,1,2
        unsigned char Mode;              // ModeList
@@@ -248,9 -94,7 +245,9 @@@
        inline bool Downgrade() const {return Status < 0 && Mode == ModeInstall;};
        inline bool Held() const {return Status != 0 && Keep();};
        inline bool NowBroken() const {return (DepState & DepNowMin) != DepNowMin;};
 +      inline bool NowPolicyBroken() const {return (DepState & DepNowPolicy) != DepNowPolicy;};
        inline bool InstBroken() const {return (DepState & DepInstMin) != DepInstMin;};
 +      inline bool InstPolicyBroken() const {return (DepState & DepInstPolicy) != DepInstPolicy;};
        inline bool Install() const {return Mode == ModeInstall;};
        inline VerIterator InstVerIter(pkgCache &Cache)
                  {return VerIterator(Cache,InstallVer);};
@@@ -272,14 -116,6 +269,14 @@@
        
        virtual ~Policy() {};
     };
 +
 +   private:
 +   /** The number of open "action groups"; certain post-action
 +    *  operations are suppressed if this number is > 0.
 +    */
 +   int group_level;
 +
 +   friend class ActionGroup;
       
     protected:
  
@@@ -294,7 -130,6 +291,7 @@@
     unsigned long iDelCount;
     unsigned long iKeepCount;
     unsigned long iBrokenCount;
 +   unsigned long iPolicyBrokenCount;
     unsigned long iBadCount;
     
     Policy *delLocalPolicy;           // For memory clean up..
@@@ -344,69 -179,16 +341,69 @@@
     inline StateCache &operator [](PkgIterator const &I) {return PkgState[I->ID];};
     inline unsigned char &operator [](DepIterator const &I) {return DepState[I->ID];};
  
 -   // Manipulators
 -   void MarkKeep(PkgIterator const &Pkg,bool Soft = false);
 +   /** \return A function identifying packages in the root set other
 +    *  than manually installed packages and essential packages, or \b
 +    *  NULL if an error occurs.
 +    *
 +    *  \todo Is this the best place for this function?  Perhaps the
 +    *  settings for mark-and-sweep should be stored in a single
 +    *  external class?
 +    */
 +   virtual InRootSetFunc *GetRootSetFunc();
 +
 +   /** \return \b true if the garbage collector should follow recommendations.
 +    */
 +   virtual bool MarkFollowsRecommends();
 +
 +   /** \return \b true if the garbage collector should follow suggestions.
 +    */
 +   virtual bool MarkFollowsSuggests();
 +
 +   /** \brief Update the Marked and Garbage fields of all packages.
 +    *
 +    *  This routine is implicitly invoked after all state manipulators
 +    *  and when an ActionGroup is destroyed.  It invokes #MarkRequired
 +    *  and #Sweep to do its dirty work.
 +    *
 +    *  \param rootFunc A predicate that returns \b true for packages
 +    *  that should be added to the root set.
 +    */
 +   bool MarkAndSweep(InRootSetFunc &rootFunc)
 +   {
 +     return MarkRequired(rootFunc) && Sweep();
 +   }
 +
 +   bool MarkAndSweep()
 +   {
 +     std::auto_ptr<InRootSetFunc> f(GetRootSetFunc());
 +     if(f.get() != NULL)
 +       return MarkAndSweep(*f.get());
 +     else
 +       return false;
 +   }
 +
 +   /** \name State Manipulators
 +    */
 +   // @{
 +   void MarkKeep(PkgIterator const &Pkg, bool Soft = false,
 +		 bool FromUser = true);
     void MarkDelete(PkgIterator const &Pkg,bool Purge = false);
     void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true,
 -		    unsigned long Depth = 0);
 +		    unsigned long Depth = 0, bool FromUser = true,
 +		    bool ForceImportantDeps = false);
     void SetReInstall(PkgIterator const &Pkg,bool To);
     void SetCandidateVersion(VerIterator TargetVer);
 +
 +   /** Set the "is automatically installed" flag of Pkg. */
 +   void MarkAuto(const PkgIterator &Pkg, bool Auto);
 +   // @}
     
     // This is for debuging
     void Update(OpProgress *Prog = 0);
 +
 +   // read persistent states
 +   bool readStateFile(OpProgress *prog);
 +   bool writeStateFile(OpProgress *prog);
     
     // Size queries
     inline double UsrSize() {return iUsrSize;};
@@@ -415,7 -197,6 +412,7 @@@
     inline unsigned long KeepCount() {return iKeepCount;};
     inline unsigned long InstCount() {return iInstCount;};
     inline unsigned long BrokenCount() {return iBrokenCount;};
 +   inline unsigned long PolicyBrokenCount() {return iPolicyBrokenCount;};
     inline unsigned long BadCount() {return iBadCount;};
  
     bool Init(OpProgress *Prog);
diff --combined apt-pkg/indexfile.h
index d5d1cf57a,f1c0268b8..3cc501629
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@@ -5,11 -5,10 +5,11 @@@
  
     Index File - Abstraction for an index of archive/source file.
     
 -   There are 3 primary sorts of index files, all represented by this 
 +   There are 4 primary sorts of index files, all represented by this 
     class:
     
     Binary index files 
 +   Binary translation files 
     Bianry index files decribing the local system
     Source index files
     
@@@ -22,9 -21,6 +22,6 @@@
  #ifndef PKGLIB_INDEXFILE_H
  #define PKGLIB_INDEXFILE_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/indexfile.h"
- #endif
  
  #include <string>
  #include <apt-pkg/pkgcache.h>
@@@ -81,10 -77,6 +78,10 @@@ class pkgIndexFil
     virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress &/*Prog*/) const {return true;};
     virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
  
 +   static bool TranslationsAvailable();
 +   static bool CheckLanguageCode(const char *Lang);
 +   static string LanguageCode();
 +
     bool IsTrusted() const { return Trusted; };
     
     pkgIndexFile(bool Trusted): Trusted(Trusted) {};
diff --combined apt-pkg/init.h
index c6457cbca,8255b406a..a2da80c34
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@@ -17,8 -17,8 +17,8 @@@
  #include <apt-pkg/pkgsystem.h>
  
  // See the makefile
 -#define APT_PKG_MAJOR 3
 -#define APT_PKG_MINOR 11
 +#define APT_PKG_MAJOR 4
- #define APT_PKG_MINOR 2
++#define APT_PKG_MINOR 3
  #define APT_PKG_RELEASE 0
      
  extern const char *pkgVersion;
diff --combined apt-pkg/makefile
index 59df6c0ef,7e5feae53..fc9e32cfb
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@@ -13,7 -13,7 +13,7 @@@ include ../buildlib/defaults.ma
  # methods/makefile - FIXME
  LIBRARY=apt-pkg
  LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
- MAJOR=4.2
 -MAJOR=3.11
++MAJOR=4.3
  MINOR=0
  SLIBS=$(PTHREADLIB) $(INTLLIBS)
  APT_DOMAIN:=libapt-pkg$(MAJOR)
diff --combined apt-pkg/packagemanager.h
index 48f53576c,35cdca913..53600fb61
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@@ -23,14 -23,9 +23,11 @@@
  #ifndef PKGLIB_PACKAGEMANAGER_H
  #define PKGLIB_PACKAGEMANAGER_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/packagemanager.h"
- #endif
  
  #include <string>
 +#include <iostream>
  #include <apt-pkg/pkgcache.h>
 +#include <apt-pkg/depcache.h>
  
  using std::string;
  
@@@ -72,39 -67,13 +69,39 @@@ class pkgPackageManager : protected pkg
     virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
     virtual bool Go(int statusFd=-1) {return true;};
     virtual void Reset() {};
 -   
 +
 +   // the result of the operation
 +   OrderResult Res;
 +
     public:
        
     // Main action members
     bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
  		    pkgRecords *Recs);
 -   OrderResult DoInstall(int statusFd=-1); 
 +
 +   // Do the installation 
 +   OrderResult DoInstall(int statusFd=-1);
 +
 +   // stuff that needs to be done before the fork() of a library that
 +   // uses apt
 +   OrderResult DoInstallPreFork() {
 +      Res = OrderInstall();
 +      return Res;
 +   };
 +
 +   // stuff that needs to be done after the fork
 +   OrderResult DoInstallPostFork(int statusFd=-1) {
 +      bool goResult = Go(statusFd);
 +      if(goResult == false) 
 +	 return Failed;
 +
 +      // if all was fine update the state file
 +      if(Res == Completed) {
 +	 Cache.writeStateFile(NULL);
 +      }
 +      return Res;
 +   };
 +
     bool FixMissing();
     
     pkgPackageManager(pkgDepCache *Cache);
diff --combined apt-pkg/pkgcache.cc
index 162ab4f27,5672e60a4..28c972aed
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@@ -20,13 -20,7 +20,8 @@@
     ##################################################################### */
  									/*}}}*/
  // Include Files							/*{{{*/
- #ifdef __GNUG__
- #pragma implementation "apt-pkg/pkgcache.h"
- #pragma implementation "apt-pkg/cacheiterators.h"
- #endif 
- 
  #include <apt-pkg/pkgcache.h>
 +#include <apt-pkg/indexfile.h>
  #include <apt-pkg/version.h>
  #include <apt-pkg/error.h>
  #include <apt-pkg/strutl.h>
@@@ -44,7 -38,6 +39,7 @@@
  
  using std::string;
  
 +
  // Cache::Header::Header - Constructor					/*{{{*/
  // ---------------------------------------------------------------------
  /* Simply initialize the header */
@@@ -54,7 -47,7 +49,7 @@@ pkgCache::Header::Header(
     
     /* Whenever the structures change the major version should be bumped,
        whenever the generator changes the minor version should be bumped. */
 -   MajorVersion = 4;
 +   MajorVersion = 5;
     MinorVersion = 0;
     Dirty = false;
     
@@@ -62,22 -55,17 +57,22 @@@
     PackageSz = sizeof(pkgCache::Package);
     PackageFileSz = sizeof(pkgCache::PackageFile);
     VersionSz = sizeof(pkgCache::Version);
 +   DescriptionSz = sizeof(pkgCache::Description);
     DependencySz = sizeof(pkgCache::Dependency);
     ProvidesSz = sizeof(pkgCache::Provides);
     VerFileSz = sizeof(pkgCache::VerFile);
 +   DescFileSz = sizeof(pkgCache::DescFile);
     
     PackageCount = 0;
     VersionCount = 0;
 +   DescriptionCount = 0;
     DependsCount = 0;
     PackageFileCount = 0;
     VerFileCount = 0;
 +   DescFileCount = 0;
     ProvidesCount = 0;
     MaxVerFileSize = 0;
 +   MaxDescFileSize = 0;
     
     FileList = 0;
     StringList = 0;
@@@ -96,10 -84,8 +91,10 @@@ bool pkgCache::Header::CheckSizes(Heade
         PackageSz == Against.PackageSz &&
         PackageFileSz == Against.PackageFileSz &&
         VersionSz == Against.VersionSz &&
 +       DescriptionSz == Against.DescriptionSz &&
         DependencySz == Against.DependencySz &&
         VerFileSz == Against.VerFileSz &&
 +       DescFileSz == Against.DescFileSz &&
         ProvidesSz == Against.ProvidesSz)
        return true;
     return false;
@@@ -124,10 -110,8 +119,10 @@@ bool pkgCache::ReMap(
     HeaderP = (Header *)Map.Data();
     PkgP = (Package *)Map.Data();
     VerFileP = (VerFile *)Map.Data();
 +   DescFileP = (DescFile *)Map.Data();
     PkgFileP = (PackageFile *)Map.Data();
     VerP = (Version *)Map.Data();
 +   DescP = (Description *)Map.Data();
     ProvideP = (Provides *)Map.Data();
     DepP = (Dependency *)Map.Data();
     StringItemP = (StringItem *)Map.Data();
@@@ -246,11 -230,11 +241,11 @@@ const char *pkgCache::Priority(unsigne
     return 0;
  }
  									/*}}}*/
 -
  // Bases for iterator classes						/*{{{*/
  void pkgCache::VerIterator::_dummy() {}
  void pkgCache::DepIterator::_dummy() {}
  void pkgCache::PrvIterator::_dummy() {}
 +void pkgCache::DescIterator::_dummy() {}
  									/*}}}*/
  // PkgIterator::operator ++ - Postfix incr				/*{{{*/
  // ---------------------------------------------------------------------
@@@ -610,20 -594,3 +605,20 @@@ string pkgCache::PkgFileIterator::RelSt
     return Res;
  }
  									/*}}}*/
 +// VerIterator::TranslatedDescription - Return the a DescIter for locale/*{{{*/
 +// ---------------------------------------------------------------------
 +/* return a DescIter for the current locale or the default if none is 
 + * found
 + */
 +pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const
 +{
 +   pkgCache::DescIterator DescDefault = DescriptionList();
 +   pkgCache::DescIterator Desc = DescDefault;
 +   for (; Desc.end() == false; Desc++)
 +      if (pkgIndexFile::LanguageCode() == Desc.LanguageCode())
 +	 break;
 +   if (Desc.end() == true) Desc = DescDefault;
 +   return Desc;
 +};
 +
 +									/*}}}*/
diff --combined apt-pkg/pkgcache.h
index c7a3172cc,8e7fc252c..5ae611ba4
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@@ -19,9 -19,6 +19,6 @@@
  #ifndef PKGLIB_PKGCACHE_H
  #define PKGLIB_PKGCACHE_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/pkgcache.h"
- #endif 
  
  #include <string>
  #include <time.h>
@@@ -38,30 -35,24 +35,30 @@@ class pkgCach
     struct Package;
     struct PackageFile;
     struct Version;
 +   struct Description;
     struct Provides;
     struct Dependency;
     struct StringItem;
     struct VerFile;
 +   struct DescFile;
     
     // Iterators
     class PkgIterator;
     class VerIterator;
 +   class DescIterator;
     class DepIterator;
     class PrvIterator;
     class PkgFileIterator;
     class VerFileIterator;
 +   class DescFileIterator;
     friend class PkgIterator;
     friend class VerIterator;
 +   friend class DescInterator;
     friend class DepIterator;
     friend class PrvIterator;
     friend class PkgFileIterator;
     friend class VerFileIterator;
 +   friend class DescFileIterator;
     
     class Namespace;
     
@@@ -104,10 -95,8 +101,10 @@@
     Header *HeaderP;
     Package *PkgP;
     VerFile *VerFileP;
 +   DescFile *DescFileP;
     PackageFile *PkgFileP;
     Version *VerP;
 +   Description *DescP;
     Provides *ProvideP;
     Dependency *DepP;
     StringItem *StringItemP;
@@@ -159,20 -148,16 +156,20 @@@ struct pkgCache::Heade
     unsigned short PackageSz;
     unsigned short PackageFileSz;
     unsigned short VersionSz;
 +   unsigned short DescriptionSz;
     unsigned short DependencySz;
     unsigned short ProvidesSz;
     unsigned short VerFileSz;
 +   unsigned short DescFileSz;
     
     // Structure counts
     unsigned long PackageCount;
     unsigned long VersionCount;
 +   unsigned long DescriptionCount;
     unsigned long DependsCount;
     unsigned long PackageFileCount;
     unsigned long VerFileCount;
 +   unsigned long DescFileCount;
     unsigned long ProvidesCount;
     
     // Offsets
@@@ -181,11 -166,10 +178,11 @@@
     map_ptrloc VerSysName;            // StringTable
     map_ptrloc Architecture;          // StringTable
     unsigned long MaxVerFileSize;
 +   unsigned long MaxDescFileSize;
  
     /* Allocation pools, there should be one of these for each structure
        excluding the header */
 -   DynamicMMap::Pool Pools[7];
 +   DynamicMMap::Pool Pools[8];
     
     // Rapid package name lookup
     map_ptrloc HashTable[2*1048];
@@@ -206,7 -190,7 +203,7 @@@ struct pkgCache::Packag
     map_ptrloc NextPackage;       // Package
     map_ptrloc RevDepends;        // Dependency
     map_ptrloc ProvidesList;      // Provides
 -   
 +
     // Install/Remove/Purge etc
     unsigned char SelectedState;     // What
     unsigned char InstState;         // Flags
@@@ -245,14 -229,6 +242,14 @@@ struct pkgCache::VerFil
     unsigned short Size;
  };
  
 +struct pkgCache::DescFile
 +{
 +   map_ptrloc File;           // PackageFile
 +   map_ptrloc NextFile;       // PkgVerFile
 +   map_ptrloc Offset;         // File offset
 +   unsigned short Size;
 +};
 +
  struct pkgCache::Version
  {
     map_ptrloc VerStr;            // Stringtable
@@@ -262,7 -238,6 +259,7 @@@
     // Lists
     map_ptrloc FileList;          // VerFile
     map_ptrloc NextVer;           // Version
 +   map_ptrloc DescriptionList;   // Description
     map_ptrloc DependsList;       // Dependency
     map_ptrloc ParentPkg;         // Package
     map_ptrloc ProvidesList;      // Provides
@@@ -274,22 -249,6 +271,22 @@@
     unsigned char Priority;
  };
  
 +struct pkgCache::Description
 +{
 +   // Language Code store the description translation language code. If
 +   // the value has a 0 lenght then this is readed using the Package
 +   // file else the Translation-CODE are used.
 +   map_ptrloc language_code;     // StringTable
 +   map_ptrloc md5sum;            // StringTable
 +
 +   // Linked list 
 +   map_ptrloc FileList;          // DescFile
 +   map_ptrloc NextDesc;          // Description
 +   map_ptrloc ParentPkg;         // Package
 +
 +   unsigned short ID;
 +};
 +
  struct pkgCache::Dependency
  {
     map_ptrloc Version;         // Stringtable
@@@ -337,13 -296,11 +334,13 @@@ class pkgCache::Namespac
  
     typedef pkgCache::PkgIterator PkgIterator;
     typedef pkgCache::VerIterator VerIterator;
 +   typedef pkgCache::DescIterator DescIterator;
     typedef pkgCache::DepIterator DepIterator;
     typedef pkgCache::PrvIterator PrvIterator;
     typedef pkgCache::PkgFileIterator PkgFileIterator;
     typedef pkgCache::VerFileIterator VerFileIterator;   
     typedef pkgCache::Version Version;
 +   typedef pkgCache::Description Description;
     typedef pkgCache::Package Package;
     typedef pkgCache::Header Header;
     typedef pkgCache::Dep Dep;
diff --combined apt-pkg/pkgcachegen.h
index fae1a60a6,70616c0a8..a47b097b3
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@@ -19,12 -19,8 +19,9 @@@
  #ifndef PKGLIB_PKGCACHEGEN_H
  #define PKGLIB_PKGCACHEGEN_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/pkgcachegen.h"
- #endif 
  
  #include <apt-pkg/pkgcache.h>
 +#include <apt-pkg/md5.h>
  
  class pkgSourceList;
  class OpProgress;
@@@ -56,9 -52,7 +53,9 @@@ class pkgCacheGenerato
     
     bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Pkg);
     bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
 +   bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List);
     unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next);
 +   map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const string &Lang,const MD5SumValue &md5sum,map_ptrloc Next);
  
     public:
  
@@@ -111,9 -105,6 +108,9 @@@ class pkgCacheGenerator::ListParse
     virtual string Package() = 0;
     virtual string Version() = 0;
     virtual bool NewVersion(pkgCache::VerIterator Ver) = 0;
 +   virtual string Description() = 0;
 +   virtual string DescriptionLanguage() = 0;
 +   virtual MD5SumValue Description_md5() = 0;
     virtual unsigned short VersionHash() = 0;
     virtual bool UsePackage(pkgCache::PkgIterator Pkg,
  			   pkgCache::VerIterator Ver) = 0;
diff --combined apt-pkg/pkgrecords.h
index 31c444dbf,d431101fe..21aa66322
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@@ -17,9 -17,6 +17,6 @@@
  #ifndef PKGLIB_PKGRECORDS_H
  #define PKGLIB_PKGRECORDS_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/pkgrecords.h"
- #endif 
  
  #include <apt-pkg/pkgcache.h>
  #include <apt-pkg/fileutl.h>
@@@ -38,7 -35,6 +35,7 @@@ class pkgRecord
  
     // Lookup function
     Parser &Lookup(pkgCache::VerFileIterator const &Ver);
 +   Parser &Lookup(pkgCache::DescFileIterator const &Desc);
  
     // Construct destruct
     pkgRecords(pkgCache &Cache);
@@@ -50,7 -46,6 +47,7 @@@ class pkgRecords::Parse
     protected:
     
     virtual bool Jump(pkgCache::VerFileIterator const &Ver) = 0;
 +   virtual bool Jump(pkgCache::DescFileIterator const &Desc) = 0;
     
     public:
     friend class pkgRecords;
diff --combined methods/makefile
index 5bd05eae1,1e3b1ef85..948f27889
--- a/methods/makefile
+++ b/methods/makefile
@@@ -7,7 -7,7 +7,7 @@@ include ../buildlib/defaults.ma
  BIN := $(BIN)/methods
  
  # FIXME..
- LIB_APT_PKG_MAJOR = 4.2
 -LIB_APT_PKG_MAJOR = 3.11
++LIB_APT_PKG_MAJOR = 4.3
  APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
  
  # The file method
@@@ -59,13 -59,6 +59,13 @@@ LIB_MAKES = apt-pkg/makefil
  SOURCE = ftp.cc rfc2553emu.cc connect.cc
  include $(PROGRAM_H)
  
 +# The rred method
 +PROGRAM=rred
 +SLIBS = -lapt-pkg $(SOCKETLIBS)
 +LIB_MAKES = apt-pkg/makefile
 +SOURCE = rred.cc
 +include $(PROGRAM_H)
 +
  # The rsh method
  PROGRAM=rsh
  SLIBS = -lapt-pkg
diff --combined po/apt-all.pot
index 90da19119,4c354136a..d11b80123
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2006-10-02 15:46+0200\n"
 +"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@@ -15,153 -15,145 +15,153 @@@
  "Content-Type: text/plain; charset=CHARSET\n"
  "Content-Transfer-Encoding: 8bit\n"
  
 -#: cmdline/apt-cache.cc:135
 +#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
 -#: cmdline/apt-cache.cc:1508
 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:232
 +#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:272
 +#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:273
 +#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:274
 +#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:275
 +#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:276
 +#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:278
 +#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:280
 +#: cmdline/apt-cache.cc:293
 +msgid "Total Distinct Descriptions: "
 +msgstr ""
 +
 +#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:283
 +#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:285
 +#: cmdline/apt-cache.cc:300
 +msgid "Total Desc/File relations: "
 +msgstr ""
 +
 +#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:297
 +#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:311
 +#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:316
 +#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:324
 +#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1231
 +#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1385
 +#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1462
 +#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1470
 +#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr ""
  
  #. Show any packages have explicit pins
 -#: cmdline/apt-cache.cc:1482
 +#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr ""
  
  #. Installed version
 -#: cmdline/apt-cache.cc:1515
 +#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr ""
  
  #. Candidate Version
 -#: cmdline/apt-cache.cc:1522
 +#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1532
 +#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr ""
  
  #. Show the priority tables
 -#: cmdline/apt-cache.cc:1541
 +#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1556
 +#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 +#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 +#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr ""
  
 -#: cmdline/apt-cache.cc:1659
 +#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -251,7 -243,7 +251,7 @@@ msgid "
  "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
  msgstr ""
  
 -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr ""
@@@ -550,221 -542,221 +550,221 @@@ msgstr "
  msgid "Failed to rename %s to %s"
  msgstr ""
  
 -#: cmdline/apt-get.cc:120
 +#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr ""
  
 -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr ""
  
 -#: cmdline/apt-get.cc:237
 +#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:327
 +#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr ""
  
 -#: cmdline/apt-get.cc:329
 +#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr ""
  
 -#: cmdline/apt-get.cc:336
 +#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr ""
  
 -#: cmdline/apt-get.cc:338
 +#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr ""
  
 -#: cmdline/apt-get.cc:341
 +#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr ""
  
 -#: cmdline/apt-get.cc:341
 +#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr ""
  
 -#: cmdline/apt-get.cc:346
 +#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr ""
  
 -#: cmdline/apt-get.cc:375
 +#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:401
 +#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:423
 +#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:444
 +#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:465
 +#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:485
 +#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:538
 +#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr ""
  
 -#: cmdline/apt-get.cc:546
 +#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
  msgstr ""
  
 -#: cmdline/apt-get.cc:577
 +#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr ""
  
 -#: cmdline/apt-get.cc:581
 +#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr ""
  
 -#: cmdline/apt-get.cc:583
 +#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr ""
  
 -#: cmdline/apt-get.cc:585
 +#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:589
 +#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:649
 +#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr ""
  
 -#: cmdline/apt-get.cc:652
 +#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr ""
  
 -#: cmdline/apt-get.cc:655
 +#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr ""
  
 -#: cmdline/apt-get.cc:658
 +#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr ""
  
 -#: cmdline/apt-get.cc:660
 +#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr ""
  
 -#: cmdline/apt-get.cc:664
 +#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr ""
  
 -#: cmdline/apt-get.cc:667
 +#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr ""
  
 -#: cmdline/apt-get.cc:689
 +#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr ""
  
 -#: cmdline/apt-get.cc:693
 +#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:700
 +#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr ""
  
 -#: cmdline/apt-get.cc:702
 +#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr ""
  
 -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr ""
  
 -#: cmdline/apt-get.cc:755
 +#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr ""
  
 -#: cmdline/apt-get.cc:764
 +#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr ""
  
 -#: cmdline/apt-get.cc:775
 +#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr ""
  
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr ""
  
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr ""
  
 -#: cmdline/apt-get.cc:816
 +#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  
 -#: cmdline/apt-get.cc:821
 +#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:824
 +#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:829
 +#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:832
 +#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr ""
  
 -#: cmdline/apt-get.cc:849
 +#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr ""
  
 -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  
 -#: cmdline/apt-get.cc:866
 +#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr ""
  
 -#: cmdline/apt-get.cc:868
 +#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -772,74 -764,74 +772,74 @@@
  " ?] "
  msgstr ""
  
 -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr ""
  
 -#: cmdline/apt-get.cc:889
 +#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr ""
  
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:979
 +#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr ""
  
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr ""
  
 -#: cmdline/apt-get.cc:986
 +#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
  msgstr ""
  
 -#: cmdline/apt-get.cc:990
 +#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr ""
  
 -#: cmdline/apt-get.cc:995
 +#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr ""
  
 -#: cmdline/apt-get.cc:996
 +#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr ""
  
 -#: cmdline/apt-get.cc:1030
 +#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1040
 +#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1058
 +#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1069
 +#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1081
 +#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1086
 +#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr ""
  
 -#: cmdline/apt-get.cc:1091
 +#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -847,97 -839,79 +847,97 @@@
  "is only available from another source\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1110
 +#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1113
 +#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1133
 +#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1141
 +#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1168
 +#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1170
 +#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1176
 +#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1313
 +#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1326
 +#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1384
 +#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
  msgstr ""
  
 -#: cmdline/apt-get.cc:1403
 +#: cmdline/apt-get.cc:1415
 +msgid "We are not supposed to delete stuff, can't start AutoRemover"
 +msgstr ""
 +
 +#: cmdline/apt-get.cc:1440
 +msgid ""
 +"Hmm, seems like the AutoRemover destroyed something which really\n"
 +"shouldn't happen. Please file a bug report against apt."
 +msgstr ""
 +
 +#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
 +msgid "The following information may help to resolve the situation:"
 +msgstr ""
 +
 +#: cmdline/apt-get.cc:1447
 +msgid "Internal Error, AutoRemover broke stuff"
 +msgstr ""
 +
 +#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 +#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1516
 +#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1546
 +#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1549
 +#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
  msgstr ""
  
 -#: cmdline/apt-get.cc:1561
 +#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -945,159 -919,163 +945,159 @@@
  "or been moved out of Incoming."
  msgstr ""
  
 -#: cmdline/apt-get.cc:1569
 +#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
  "that package should be filed."
  msgstr ""
  
 -#: cmdline/apt-get.cc:1574
 -msgid "The following information may help to resolve the situation:"
 -msgstr ""
 -
 -#: cmdline/apt-get.cc:1577
 +#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1603
 +#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1692
 +#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1693
 +#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1713
 +#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr ""
  
 -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 +#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1721
 +#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 +#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1894
 +#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 +#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1968
 +#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1992
 +#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr ""
  
 -#: cmdline/apt-get.cc:1997
 +#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2000
 +#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2006
 +#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2037
 +#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr ""
  
 -#: cmdline/apt-get.cc:2065
 +#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2077
 +#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2078
 +#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2095
 +#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2114
 +#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2130
 +#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2158
 +#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2178
 +#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2230
 +#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2282
 +#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
  "package %s can satisfy version requirements"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2317
 +#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2342
 +#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2356
 +#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr ""
  
 -#: cmdline/apt-get.cc:2360
 +#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2392
 +#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr ""
  
 -#: cmdline/apt-get.cc:2433
 +#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1382,9 -1360,9 +1382,9 @@@ msgid "The info and temp directories ne
  msgstr ""
  
  #. Build the status cache
 -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
 -#: apt-pkg/pkgcachegen.cc:840
 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
 +#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
 +#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr ""
  
@@@ -1512,13 -1490,12 +1512,14 @@@ msgstr "
  msgid "File not found"
  msgstr ""
  
 -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
 -#: methods/gzip.cc:150
 +#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr ""
  
 -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 +#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
- #: methods/rred.cc:240
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr ""
  
@@@ -1644,7 -1621,7 +1645,7 @@@ msgstr "
  msgid "Unable to accept connection"
  msgstr ""
  
 -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr ""
  
@@@ -1765,86 -1742,86 +1766,86 @@@ msgid "
  "available:\n"
  msgstr ""
  
- #: methods/gzip.cc:57
 -#: methods/gzip.cc:64
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr ""
  
- #: methods/gzip.cc:102
 -#: methods/gzip.cc:109
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr ""
  
 -#: methods/http.cc:376
 +#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr ""
  
 -#: methods/http.cc:522
 +#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr ""
  
 -#: methods/http.cc:530
 +#: methods/http.cc:529
  msgid "Bad header line"
  msgstr ""
  
 -#: methods/http.cc:549 methods/http.cc:556
 +#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr ""
  
 -#: methods/http.cc:585
 +#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr ""
  
 -#: methods/http.cc:600
 +#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr ""
  
 -#: methods/http.cc:602
 +#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr ""
  
 -#: methods/http.cc:626
 +#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr ""
  
 -#: methods/http.cc:773
 +#: methods/http.cc:772
  msgid "Select failed"
  msgstr ""
  
 -#: methods/http.cc:778
 +#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr ""
  
 -#: methods/http.cc:801
 +#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr ""
  
 -#: methods/http.cc:832
 +#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr ""
  
 -#: methods/http.cc:860
 +#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr ""
  
 -#: methods/http.cc:874
 +#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr ""
  
 -#: methods/http.cc:876
 +#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr ""
  
 -#: methods/http.cc:1107
 +#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr ""
  
 -#: methods/http.cc:1124
 +#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr ""
  
 -#: methods/http.cc:1215
 +#: methods/http.cc:1214
  msgid "Internal error"
  msgstr ""
  
@@@ -1857,7 -1834,7 +1858,7 @@@ msgstr "
  msgid "Couldn't make mmap of %lu bytes"
  msgstr ""
  
 -#: apt-pkg/contrib/strutl.cc:938
 +#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr ""
@@@ -1917,12 -1894,12 +1918,12 @@@ msgstr "
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr ""
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr ""
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr ""
@@@ -2054,107 -2031,93 +2055,109 @@@ msgstr "
  msgid "Problem syncing the file"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:137
 -#: apt-pkg/pkgcache.cc:121
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:143
 -#: 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:148
 -#: 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:153
 -#: 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:158
 -#: 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:229
 -#: apt-pkg/pkgcache.cc:213
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:229
 -#: apt-pkg/pkgcache.cc:213
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:229
 -#: apt-pkg/pkgcache.cc:213
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:230
 -#: apt-pkg/pkgcache.cc:214
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:230
 -#: apt-pkg/pkgcache.cc:214
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:230
 -#: apt-pkg/pkgcache.cc:214
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:231
 -#: apt-pkg/pkgcache.cc:215
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:242
 -#: apt-pkg/pkgcache.cc:226
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:242
 -#: apt-pkg/pkgcache.cc:226
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:242
 -#: apt-pkg/pkgcache.cc:226
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:243
 -#: apt-pkg/pkgcache.cc:227
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:243
 -#: apt-pkg/pkgcache.cc:227
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr ""
  
- #: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
 -#: apt-pkg/depcache.cc:58 apt-pkg/depcache.cc:87
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr ""
  
- #: apt-pkg/depcache.cc:102
 -#: apt-pkg/depcache.cc:59
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr ""
  
- #: apt-pkg/depcache.cc:131
 -#: apt-pkg/depcache.cc:88
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr ""
  
 -#: apt-pkg/tagfile.cc:106
 +#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
 +msgid "Reading state information"
 +msgstr ""
 +
- #: apt-pkg/depcache.cc:199
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
 +#, c-format
 +msgid "Failed to open StateFile %s"
 +msgstr ""
 +
- #: apt-pkg/depcache.cc:205
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
 +#, c-format
 +msgid "Failed to write temporary StateFile %s"
 +msgstr ""
 +
- #: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:186
 -#: apt-pkg/tagfile.cc:193
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr ""
@@@ -2189,7 -2152,7 +2192,7 @@@ msgstr "
  msgid "Opening %s"
  msgstr ""
  
 -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr ""
@@@ -2222,19 -2185,19 +2225,19 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr ""
  
 -#: apt-pkg/algorithms.cc:241
 +#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  
 -#: apt-pkg/algorithms.cc:1059
 +#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
  msgstr ""
  
 -#: apt-pkg/algorithms.cc:1061
 +#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  
@@@ -2275,12 -2238,12 +2278,12 @@@ msgstr "
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr ""
  
 -#: apt-pkg/init.cc:120
 +#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr ""
  
 -#: apt-pkg/init.cc:136
 +#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr ""
  
@@@ -2314,134 -2277,119 +2317,134 @@@ msgstr "
  msgid "No priority (or zero) specified for pin"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:74
 +#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:117
 +#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:129
 +#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:150
 +#: apt-pkg/pkgcachegen.cc:157
 +#, c-format
 +msgid "Error occured while processing %s (NewFileDesc1)"
 +msgstr ""
 +
 +#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:154
 +#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:184
 +#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:188
 +#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:192
 +#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:207
 +#: apt-pkg/pkgcachegen.cc:249
 +#, c-format
 +msgid "Error occured while processing %s (NewFileDesc2)"
 +msgstr ""
 +
 +#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:210
 +#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:213
 +#: apt-pkg/pkgcachegen.cc:261
 +msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 +msgstr ""
 +
 +#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:241
 +#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:254
 +#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:260
 +#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:574
 +#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:658
 +#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
 +#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:126
 +#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 +#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
 +#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:640
 +#: apt-pkg/acquire-item.cc:1097
  msgid "There are no public key available for the following key IDs:\n"
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:753
 +#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
  "to manually fix this package. (due to missing arch)"
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:812
 +#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
  "manually fix this package."
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:848
 +#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  
 -#: apt-pkg/acquire-item.cc:935
 +#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr ""
  
@@@ -2450,94 -2398,92 +2453,94 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:507
 +#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
  "Mounting CD-ROM\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:541
 +#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:561
 +#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:579
 +#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:583
 +#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr ""
  
  #. Mount the new CDROM
 -#: apt-pkg/cdrom.cc:591
 +#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:609
 +#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:647
 +#: apt-pkg/cdrom.cc:673
  #, c-format
 -msgid "Found %i package indexes, %i source indexes and %i signatures\n"
 +msgid ""
 +"Found %i package indexes, %i source indexes, %i translation indexes and %i "
 +"signatures\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:710
 +#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:726
 +#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
  "'%s'\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:730
 +#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:754
 +#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:763
 +#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr ""
  
 -#: apt-pkg/cdrom.cc:803
 +#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr ""
  
 -#: apt-pkg/indexcopy.cc:261
 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr ""
  
 -#: apt-pkg/indexcopy.cc:263
 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr ""
  
 -#: apt-pkg/indexcopy.cc:266
 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr ""
  
 -#: apt-pkg/indexcopy.cc:269
 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2592,10 -2538,6 +2595,14 @@@ msgstr "
  msgid "Completely removed %s"
  msgstr ""
  
 +#: methods/rred.cc:219
 +msgid "Could not patch file"
 +msgstr ""
 +
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr ""
++
++#: apt-pkg/acquire-item.cc:1097
++msgid "There is no public key available for the following key IDs:\n"
++msgstr ""
diff --combined po/bg.po
index 25e538879,d2d66d2db..1f85fd6a9
--- a/po/bg.po
+++ b/po/bg.po
@@@ -7,8 -7,8 +7,8 @@@ msgid "
  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: 2006-05-27 13:46+0200\n"
 -"PO-Revision-Date: 2006-03-31 22:05+0300\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
 +"PO-Revision-Date: 2006-10-12 20:14+0300\n"
  "Last-Translator: Yavor Doganov <yavor@doganov.org>\n"
  "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
  "MIME-Version: 1.0\n"
@@@ -16,146 -16,146 +16,156 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=2; plural=n != 1;\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Пакет %s версия %s има неудовлетворена зависимост:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Пакетът %s не може да бъде намерен"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Общо имена на пакети : "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Нормални пакети: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Чисти виртуални пакети: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Единични виртуални пакети: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Смесени виртуални пакети: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Липсващи: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Общо уникални версии: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Общо уникални версии: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Общо зависимости: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Общо отношения версия/файл: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Общо отношения версия/файл: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Общо отношения „Осигурява“: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Общо разгърнати низове: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Общо пространство за зависимости по версии: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Общо празно пространство: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Общо отчетено пространство: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Пакетният файл %s не е синхронизиран."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Трябва да въведете само един израз"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Няма намерени пакети"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Пакетни файлове:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  "Кешът не е синхронизиран, не може да се изпълни „x-ref“ на пакетен файл"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Отбити пакети:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(не са намерени)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Инсталирана: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(няма)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Кандидат: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Отбиване на пакета: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Таблица с версиите:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s за %s %s, компилиран на %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -306,7 -306,7 +316,7 @@@ msgstr "
  "  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
  "tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Неуспех при записа на %s"
@@@ -433,128 -433,115 +443,128 @@@ msgstr "Няма съвпадения Ð
  msgid "Some files are missing in the package file group `%s'"
  msgstr "Липсват някои файлове от групата с файлови пакети „%s“"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "БД е повредена, файлът е преименуван на %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "БД е стара, опит за актуализиране на %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +"Форматът на БД е невалиден.  Ако сте обновили от стара версия на apt, "
 +"премахнете базата от данни и я създайте наново."
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "Неуспех при отварянето на файл %s от БД: %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "Датата на файла %s е променена"
 +msgid "Failed to stat %s"
 +msgstr "Грешка при получаването на атрибути за %s"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "В архива няма поле „control“"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "Неуспех при получаването на курсор"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "W: Неуспех при четенето на директория %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "W: Неуспех при четенето на %s\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "E: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "W: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "E: Грешките се отнасят за файла "
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "Неуспех при превръщането на %s"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "Неуспех при обхода на дървото"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "Неуспех при отварянето на %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr "DeLink %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "Неуспех при прочитането на връзка %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "Неуспех при премахването на връзка %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** Неуспех при създаването на връзка %s към %s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr "Превишен лимит на DeLink от %sB.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "Грешка при получаването на атрибути за %s"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "Архивът няма поле „package“"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr "  %s няма запис „override“\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "  поддържащия пакета %s е %s, а не %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr "  %s няма запис „source override“\n"
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr "  %s няма също и запис „binary override“\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -650,79 -637,79 +660,79 @@@ msgstr "Неуспех при премÐ
  msgid "Failed to rename %s to %s"
  msgstr "Неуспех при преименуването на %s на %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "Y"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Грешка при компилирането на регулярния израз - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Следните пакети имат неудовлетворени зависимости:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "но е инсталиран %s"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "но ще бъде инсталиран %s"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "но той не може да бъде инсталиран"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "но той е виртуален пакет"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "но той не е инсталиран"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "но той няма да бъде инсталиран"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " или"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Следните НОВИ пакети ще бъдат инсталирани:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Следните пакети няма да бъдат променени:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Следните пакети ще бъдат актуализирани:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Следните задържани пакети ще бъдат променени:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (поради %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -730,146 -717,146 +740,146 @@@ msgstr "
  "ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n"
  "Това НЕ би трябвало да става освен ако знаете точно какво правите!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu актуализирани, %lu нови инсталирани, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu преинсталирани, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu върнати към по-стара версия, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu за премахване и %lu без промяна.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu не са напълно инсталирани или премахнати.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Коригиране на зависимостите..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " пропадна."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Неуспех при коригирането на зависимостите"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Неуспех при минимизирането на набора актуализации"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Готово"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr ""
  "Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
  "неизправности."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Неудовлетворени зависимости. Опитайте с „-f“."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "Предупреждението за удостоверяването е пренебрегнато.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Инсталиране на тези пакети без проверка [y/N]?"
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Някои пакети не можаха да бъдат удостоверени"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Има проблеми и „-y“ е използвано без „--force-yes“"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Вътрешна грешка, „Ordering“ не завърши"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Неуспех при заключването на директорията за изтегляне"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Списъкът с източници не можа да бъде прочетен."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  "Странно.. Размерите не съвпадат, изпратете е-поща на apt@packages.debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Необходимо е да се изтеглят %sB/%sB архиви.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Необходимо е да се изтеглят %sB архиви.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "След разпакетирането ще бъде използвано %sB дисково пространство.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "След разпакетирането ще бъде освободено %sB дисково пространство.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Неуспех при определянето на свободното пространство в %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Нямате достатъчно свободно пространство в %s."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "Указано е „Trivial Only“, но това не е тривиална операция."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Да, прави каквото казвам!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -880,28 -867,28 +890,28 @@@ msgstr "
  "За да продължите, въведете фразата „%s“\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Прекъсване."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Искате ли да продължите [Y/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Неуспех при изтеглянето на %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Някои файлове не можаха да бъдат изтеглени"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Изтеглянето завърши в режим само на изтегляне"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -909,47 -896,47 +919,47 @@@ msgstr "
  "Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ "
  "или да опитате с „--fix-missing“?"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "„--fix-missing“ и превключване на носители не се поддържа все още"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Неуспех при коригирането на липсващите пакети."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Прекъсване на инсталирането."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Забележете, избиране на %s вместо %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Пакетът %s не е инсталиран, така че не е премахнат\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Пакетът %s е виртуален пакет, осигурен от:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Инсталиран]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Трябва изрично да изберете един за инсталиране."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -960,49 -947,49 +970,49 @@@ msgstr "
  "Това може да означава, че пакета липсва, остарял е, или е достъпен\n"
  "само от друг източник\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Обаче следните пакети го заместват:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Пакетът %s няма кандидат за инсталиране"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s вече е най-новата версия.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Не е намерено издание „%s“ на „%s“"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Не е намерена версия „%s“ на „%s“"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Избрана е версия %s (%s) за %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "Командата „update“ не възприема аргументи"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Неуспех при заключването на директорията със списъка на пакетите"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1010,25 -997,25 +1020,45 @@@ msgstr "
  "Някои индексни файлове не можаха да бъдат изтеглени, те са пренебрегнати или "
  "са използвани по-стари."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr ""
++"Следната информация може да помогне за намиране на изход от ситуацията:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Неуспех при намирането на пакет %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Забележете, избиране на %s за регулярен израз „%s“\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1036,7 -1023,7 +1066,7 @@@ msgstr "
  "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или "
  "укажете разрешение)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1048,7 -1035,7 +1078,7 @@@ msgstr "
  "дистрибуция, че някои необходими пакети още не са създадени или пък\n"
  "са били преместени от Incoming."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1058,123 -1045,123 +1088,118 @@@ msgstr "
  "да не може да бъде инсталиран; в такъв случай би трябвало да се подаде\n"
  "доклад за грешка за този пакет."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr ""
--"Следната информация може да помогне за намиране на изход от ситуацията:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Счупени пакети"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Следните допълнителни пакети ще бъдат инсталирани:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Предложени пакети:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Препоръчвани пакети:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Изчисляване на актуализацията..."
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Неуспех"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Готово"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Неуспех при намирането на изходен код на пакет %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Пропускане на вече изтегления файл „%s“\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Нямате достатъчно свободно пространство в %s"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Изтегляне на изходен код %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Неуспех при изтеглянето на някои архиви."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr ""
  "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Командата за разпакетиране „%s“ пропадна.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Командата за компилиране „%s“ пропадна.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Процесът-потомък пропадна"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "Трябва да укажете поне един пакет за проверка на зависимости за компилиране"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr ""
  "Неуспех при получаването на информация за зависимостите за компилиране на %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s няма зависимости за компилиране.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1183,7 -1170,7 +1208,7 @@@ msgstr "
  "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
  "не може да бъде намерен"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1193,32 -1180,32 +1218,32 @@@ msgstr "
  "налични версии на пакета %s, които могат да удовлетворят изискването за "
  "версия"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният "
  "пакет %s е твърде нов"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Неуспех при обработката на зависимостите за компилиране"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Поддържани модули:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1401,19 -1388,19 +1426,19 @@@ msgstr "Смесване на налиÑ
  msgid "Failed to create pipes"
  msgstr "Неуспех при създаването на програмни канали"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "Неуспех при изпълнението на gzip"
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Развален архив"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Невярна контролна сума на tar, развален архив"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Непозната заглавна част на TAR тип %u, елемент %s"
@@@ -1559,9 -1546,9 +1584,9 @@@ msgstr "
  "Директориите info и temp трябва да бъдат на една и съща файлова система"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Четене на списъците с пакети"
  
@@@ -1694,12 -1681,12 +1719,14 @@@ msgstr "Дискът не е намер
  msgid "File not found"
  msgstr "Файлът не е намерен"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Неуспех при получаването на атрибути"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Неуспех при задаването на време на промяна"
  
@@@ -1829,7 -1816,7 +1856,7 @@@ msgstr "Времето за устанÐ
  msgid "Unable to accept connection"
  msgstr "Невъзможно е да се приеме свързването"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Проблем при хеширане на файла"
  
@@@ -1913,44 -1900,42 +1940,44 @@@ msgstr "Нещо лошо се случ
  msgid "Unable to connect to %s %s:"
  msgstr "Неуспех при свързването с %s %s:"
  
 -#: methods/gpgv.cc:64
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:65
 +#, c-format
  msgid "Couldn't access keyring: '%s'"
 -msgstr "Неуспех при намирането на IP адреса на „%s“"
 +msgstr "Неуспех при достъпа до набор на ключове: „%s“"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr ""
  "E: Списъкът с аргументи от Acquire::gpgv::Options е твърде дълъг. Завършване "
  "на работа."
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
  "Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на "
  "ключа?!"
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr "Намерен е поне един невалиден подпис."
  
 -#: methods/gpgv.cc:207
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:213
 +#, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 -msgstr " за проверка на подписа (инсталиран ли е gnupg?)"
 +msgstr ""
 +"Неуспех при изпълнението на „%s“ за проверка на подписа (инсталиран ли е "
 +"gnupg?)"
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr "Неизвестна грешка при изпълнението на gpgv"
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
  msgstr "Следните подписи са невалидни:\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
@@@ -1958,86 -1943,86 +1985,86 @@@ msgstr "
  "Следните подписи не можаха да бъдат проверени, защото публичния ключ не е "
  "наличен:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Неуспех при отварянето на програмен канал за %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Грешка при четене от процес %s"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Чакане на заглавни части"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Получен е един ред на заглавна част с над %u символа"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Невалиден ред на заглавна част"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Неизвестен формат на дата"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Неуспех на избора"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Допустимото време за свързване изтече"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Грешка при записа на изходен файл"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Грешка при записа на файл"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Грешка при записа на файла"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Грешка при четене от сървъра"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Невалидни данни на заглавната част"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Неуспех при свързването"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Вътрешна грешка"
  
@@@ -2050,7 -2035,7 +2077,7 @@@ msgstr "Невъзможно е да с
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Неуспех при прехвърлянето в паметта на %lu байта"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Изборът %s не е намерен"
@@@ -2112,12 -2097,12 +2139,12 @@@ 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:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Грешка!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Готово"
@@@ -2252,93 -2237,93 +2279,110 @@@ msgstr "Проблем при премÐ
  msgid "Problem syncing the file"
  msgstr "Проблем при синхронизиране на файла"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Празен кеш на пакети"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Файлът за кеш на пакети е повреден"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Файлът за кеш на пакети е несъвместима версия"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Тази версия на APT не поддържа система за версии „%s“"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "Кешът на пакети е бил направен за различна архитектура"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Зависи от"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Предварително зависи от"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Предлага се"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Препоръчва се"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Конфликтира с"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Заменя"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Изважда от употреба"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "важен"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "изискван"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "стандартен"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "незадължителен"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "допълнителен"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Изграждане на дървото със зависимости"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Версии кандидати"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Генериране на зависимости"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Смесване на наличната информация"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Неуспех при отварянето на %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Неуспех при запис на файл %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Неуспех при анализирането на пакетен файл %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Неуспех при анализирането на пакетен файл %s (2)"
@@@ -2375,7 -2360,7 +2419,7 @@@ msgstr "
  msgid "Opening %s"
  msgstr "Отваряне на %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Ред %u в списъка с източници %s е твърде дълъг."
@@@ -2414,7 -2399,7 +2458,7 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Не се поддържа индексен файл от типа „%s“"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
@@@ -2422,7 -2407,7 +2466,7 @@@ msgstr "
  "Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за "
  "него."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2430,7 -2415,7 +2474,7 @@@ msgstr "
  "Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е "
  "причинено от задържани пакети."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  "Неуспех при коригирането на проблемите, имате задържани счупени пакети."
@@@ -2448,14 -2433,14 +2492,14 @@@ msgstr "Директорията за Ð
  #. only show the ETA if it makes sense
  #. two days
  #: apt-pkg/acquire.cc:823
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li (%s remaining)"
  msgstr "Изтегляне на файл %li от %li (остават %s)"
  
  #: apt-pkg/acquire.cc:825
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li"
 -msgstr "Четене на списъка на файловете"
 +msgstr "Изтегляне на файл %li от %li"
  
  #: apt-pkg/acquire-worker.cc:113
  #, c-format
@@@ -2472,12 -2457,12 +2516,12 @@@ msgstr "Методът %s не стар
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Пакетната система „%s“ не е поддържана"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Неуспех при определянето на подходяща пакетна система"
  
@@@ -2514,104 -2499,103 +2558,120 @@@ msgstr "Неизвестен тип зÐ
  msgid "No priority (or zero) specified for pin"
  msgstr "Няма указан приоритет (или е нула) на отбиването"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Кешът има несъвместима система за версии"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Възникна грешка при обработката на %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Възникна грешка при обработката на %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Възникна грешка при обработката на %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Възникна грешка при обработката на %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Възникна грешка при обработката на %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Възникна грешка при обработката на %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Възникна грешка при обработката на %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Възникна грешка при обработката на %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Възникна грешка при обработката на %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  "Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на "
  "APT."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  "Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Възникна грешка при обработката на %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Възникна грешка при обработката на %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr ""
  "Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Събиране на информация за „Осигурява“"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "преименуването се провали, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "Несъответствие на контролна сума MD5"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2620,7 -2604,7 +2680,7 @@@ msgstr "
  "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
  "ръчно да оправите този пакет (поради пропусната архитектура)."
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2629,14 -2613,14 +2689,14 @@@ msgstr "
  "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
  "ръчно да оправите този пакет."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Несъответствие на размера"
  
@@@ -2645,7 -2629,7 +2705,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Блокът на производителя %s не съдържа отпечатък"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2654,49 -2638,49 +2714,51 @@@ msgstr "
  "Използване на точка за монтиране на CD-ROM %s\n"
  "Монтиране на CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Идентифициране..."
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Запазен етикет: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Използване на точка за монтиране на CD-ROM %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Демонтиране на CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Чакане за диск...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Монтиране на CD-ROM...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Сканиране на диска за индексни файлове...\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr ""
  "Намерени са %i индекса на пакети, %i индекса на пакети с изходен код и %i "
  "подписа.\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Това не е валидно име, опитайте отново.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2705,38 -2689,38 +2767,38 @@@ msgstr "
  "Наименование на този диск: \n"
  "„%s“\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Копиране на списъците с пакети..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Запазване на новия списък с източници\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Записите в списъка с източници за този диск са:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Демонтиране на CD-ROM..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Записани са %i записа.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Записани са %i записа с %i липсващи файла.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Записани са %i записа с %i несъответстващи файла\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n"
@@@ -2782,15 -2766,48 +2844,25 @@@ msgid "Removed %s
  msgstr "%s е премахнат"
  
  #: apt-pkg/deb/dpkgpm.cc:378
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing to completely remove %s"
 -msgstr "Подготвяне на %s за конфигуриране"
 +msgstr "Подготовка за пълно премахване на %s"
  
  #: apt-pkg/deb/dpkgpm.cc:379
 -#, fuzzy, c-format
 +#, c-format
  msgid "Completely removed %s"
 -msgstr "Неуспех при премахването на %s"
 -
 -#: methods/rsh.cc:330
 -msgid "Connection closed prematurely"
 -msgstr "Връзката прекъсна преждевременно"
 -
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
 -msgstr ""
 -
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr "  %s няма запис „override“\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr "  %s няма запис „override“\n"
 +msgstr "%s е напълно премахнат"
  
+ #: methods/rred.cc:219
+ #, fuzzy
+ msgid "Could not patch file"
+ msgstr "Неуспех при отварянето на файла %s"
+ 
 -#~ msgid "Reading file list"
 -#~ msgstr "Четене на списъка с файлове"
 -
 -#~ msgid "Could not execute "
 -#~ msgstr "Неуспех при изпълнението на "
 -
 -#~ msgid "Preparing for remove with config %s"
 -#~ msgstr "Подготвяне на %s за премахване с конфигурационните файлове"
 +#: methods/rsh.cc:330
 +msgid "Connection closed prematurely"
 +msgstr "Връзката прекъсна преждевременно"
+ 
 -#~ msgid "Removed with config %s"
 -#~ msgstr "%s е премахнат с конфигурационните файлове"
++#: apt-pkg/acquire-item.cc:1097
++#, fuzzy
++msgid "There is no public key available for the following key IDs:\n"
++msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
diff --combined po/bs.po
index 5bbff57bc,863c9d6a9..ab2cdbb15
--- a/po/bs.po
+++ b/po/bs.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
  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: 2006-05-27 13:46+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2004-05-06 15:25+0100\n"
  "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
  "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@@ -14,145 -14,145 +14,155 @@@
  "Content-Type: text/plain; charset=utf-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Paket %s verzije %s ima nezadovoljenu zavisnost:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Ne mogu pronaći paket %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Ukupno naziva paketa:"
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Normalni paketi:"
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Čisto virtuelni paketi:"
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Pojedinačni virutuelni paketi:"
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Miješani virtuelni paketi:"
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Nedostajući:"
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Ukupno različitih verzija:"
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Ukupno različitih verzija:"
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Ukupno zavisnosti:"
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Ukupno Verzija/Datoteka odnosa:"
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Ukupno Verzija/Datoteka odnosa:"
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr ""
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Paketi nisu pronađeni"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Datoteke paketa:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr ""
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr ""
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Instalirano:"
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr ""
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr ""
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -254,7 -254,7 +264,7 @@@ msgid "
  "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
  msgstr ""
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Ne mogu zapisati na %s"
@@@ -339,126 -339,115 +349,126 @@@ msgstr "
  msgid "Some files are missing in the package file group `%s'"
  msgstr ""
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "DB je bila oštećena, datoteka preimenovana u %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "DB je stara, pokušavam nadogradnju %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +
 +#: ftparchive/cachedb.cc:81
  #, fuzzy, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "Ne mogu otvoriti DB datoteku %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "Datum datoteke je promijenjen %s"
 +msgid "Failed to stat %s"
 +msgstr ""
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "Arhiva nema kontrolnog zapisa"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr ""
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr ""
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr ""
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr ""
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr ""
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr ""
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "Ne mogu otvoriti %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr ""
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr ""
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr ""
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr ""
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr ""
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr ""
  
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr ""
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr ""
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -554,223 -543,223 +564,223 @@@ msgstr "
  msgid "Failed to rename %s to %s"
  msgstr ""
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr ""
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr ""
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr ""
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "ali je %s instaliran"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "ali se %s treba instalirati"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "ali se ne može instalirati"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "ali je virtuelni paket"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "ali nije instaliran"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "ali se neće instalirati"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " ili"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Slijedeći NOVI paketi će biti instalirani:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Slijedeći paketi će biti UKLONJENI:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  #, fuzzy
  msgid "The following packages have been kept back:"
  msgstr "Slijedeći paketi su zadržani:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Slijedeći paketi će biti nadograđeni:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr ""
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr ""
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr ""
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
  msgstr ""
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr ""
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr ""
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr ""
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Ispravljam zavisnosti..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr ""
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Ne mogu ispraviti zavisnosti"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr ""
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Urađeno"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr ""
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  #, fuzzy
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "Slijedeći paketi će biti nadograđeni:"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr ""
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr ""
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr ""
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr ""
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr ""
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr ""
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr ""
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr ""
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr ""
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr ""
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Da, uradi kako kažem!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -778,75 -767,75 +788,75 @@@
  " ?] "
  msgstr ""
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Odustani."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  #, fuzzy
  msgid "Do you want to continue [Y/n]? "
  msgstr "Da li želite nastaviti? [Y/n]"
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr ""
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr ""
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
  msgstr ""
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr ""
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr ""
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Odustajem od instalacije."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr "[Instalirano]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr ""
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -854,79 -843,79 +864,97 @@@
  "is only available from another source\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Međutim, slijedeći paketi ga zamjenjuju:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr ""
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr ""
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr ""
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr ""
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr ""
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
  msgstr ""
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr ""
++
++#: cmdline/apt-get.cc:1447
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr ""
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr ""
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr ""
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr ""
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
  msgstr ""
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -934,163 -923,163 +962,159 @@@
  "or been moved out of Incoming."
  msgstr ""
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
  "that package should be filed."
  msgstr ""
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr ""
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Oštećeni paketi"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Slijedeći dodatni paketi će biti instalirani:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Predloženi paketi:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Preporučeni paketi:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Računam nadogradnju..."
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Neuspješno"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Urađeno"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr ""
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr ""
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr ""
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
  "package %s can satisfy version requirements"
  msgstr ""
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr ""
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr ""
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Podržani moduli:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1218,19 -1207,19 +1242,19 @@@ msgstr "Sastavljam dostupne informacije
  msgid "Failed to create pipes"
  msgstr ""
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "Ne mogu izvršiti gzip"
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Oštećena arhiva"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr ""
@@@ -1375,9 -1364,9 +1399,9 @@@ msgid "The info and temp directories ne
  msgstr ""
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Čitam spiskove paketa"
  
@@@ -1507,12 -1496,12 +1531,14 @@@ msgstr "Datoteka nije pronađena
  msgid "File not found"
  msgstr "Datoteka nije pronađena"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr ""
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr ""
  
@@@ -1639,7 -1628,7 +1665,7 @@@ msgstr "
  msgid "Unable to accept connection"
  msgstr ""
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr ""
  
@@@ -1723,124 -1712,124 +1749,124 @@@ msgstr "
  msgid "Unable to connect to %s %s:"
  msgstr "Ne mogu se povezati sa %s %s:"
  
 -#: methods/gpgv.cc:64
 +#: methods/gpgv.cc:65
  #, c-format
  msgid "Couldn't access keyring: '%s'"
  msgstr ""
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr ""
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr ""
  
 -#: methods/gpgv.cc:207
 +#: methods/gpgv.cc:213
  #, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
  msgstr ""
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr ""
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  #, fuzzy
  msgid "The following signatures were invalid:\n"
  msgstr "Slijedeći dodatni paketi će biti instalirani:"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
  msgstr ""
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr ""
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr ""
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Čekam na zaglavlja"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr ""
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr ""
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr ""
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr ""
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr ""
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr ""
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Nepoznat oblik datuma"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr ""
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr ""
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr ""
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr ""
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr ""
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr ""
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr ""
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr ""
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Povezivanje neuspješno"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Unutrašnja greška"
  
@@@ -1853,7 -1842,7 +1879,7 @@@ msgstr "
  msgid "Couldn't make mmap of %lu bytes"
  msgstr ""
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr ""
@@@ -1913,12 -1902,12 +1939,12 @@@ msgstr "
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr ""
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr ""
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr ""
@@@ -2050,94 -2039,94 +2076,111 @@@ msgstr "
  msgid "Problem syncing the file"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Zavisi"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Unaprijed zavisi"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Predlaže"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Preporučuje"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  #, fuzzy
  msgid "Conflicts"
  msgstr "Sukobljava se sa"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Zamjenjuje"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Zastarijeva"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "važno"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "zahtijevano"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "standardno"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "opcionalno"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Gradim stablo zavisnosti"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Verzije kandidata"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Stvaranje zavisnosti"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Sastavljam dostupne informacije"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Ne mogu otvoriti %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Ne mogu ukloniti %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr ""
@@@ -2172,7 -2161,7 +2215,7 @@@ msgstr "
  msgid "Opening %s"
  msgstr "Otvaram %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr ""
@@@ -2205,19 -2194,19 +2248,19 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr ""
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
  msgstr ""
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  
@@@ -2258,12 -2247,12 +2301,12 @@@ msgstr "
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr ""
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr ""
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr ""
  
@@@ -2297,119 -2286,119 +2340,134 @@@ msgstr "
  msgid "No priority (or zero) specified for pin"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr ""
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr ""
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr ""
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
  msgid "There are no public key available for the following key IDs:\n"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
  "to manually fix this package. (due to missing arch)"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
  "manually fix this package."
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr ""
  
@@@ -2418,94 -2407,94 +2476,96 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
  "Mounting CD-ROM\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr ""
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  #, fuzzy
  msgid "Waiting for disc...\n"
  msgstr "Čekam na zaglavlja"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:647
++#: apt-pkg/cdrom.cc:673
  #, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
  "'%s'\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  #, fuzzy
  msgid "Copying package lists..."
  msgstr "Čitam spiskove paketa"
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2560,9 -2549,26 +2620,17 @@@ msgstr "
  msgid "Completely removed %s"
  msgstr "Ne mogu ukloniti %s"
  
 -#: methods/rsh.cc:330
 -msgid "Connection closed prematurely"
 -msgstr ""
 -
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
++#: methods/rred.cc:219
++msgid "Could not patch file"
+ msgstr ""
+ 
 -#: ftparchive/writer.cc:623
 -#, c-format
 -msgid "  %s has no source override entry\n"
 +#: methods/rsh.cc:330
 +msgid "Connection closed prematurely"
  msgstr ""
  
 -#: ftparchive/writer.cc:627
 -#, c-format
 -msgid "  %s has no binary override entry either\n"
++#: apt-pkg/acquire-item.cc:1097
++msgid "There is no public key available for the following key IDs:\n"
+ msgstr ""
+ 
 -#: methods/rred.cc:219
 -msgid "Could not patch file"
 -msgstr ""
 +#~ msgid "File date has changed %s"
 +#~ msgstr "Datum datoteke je promijenjen %s"
diff --combined po/ca.po
index 1bcb6b92e,8c685f9b6..865647645
--- a/po/ca.po
+++ b/po/ca.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  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: 2006-05-27 13:46+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2006-02-05 22:00+0100\n"
  "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
  "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@@ -16,146 -16,146 +16,156 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "El paquet %s versió %s té una dependència sense satisfer:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "No s'ha trobat el paquet %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Nombre total de paquets: "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Paquets normals: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Paquets virtuals purs: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Paquets virtuals únics: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Paquets virtuals mixtes: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Falten: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Total de versions diferents: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Total de versions diferents: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Total de dependències: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Total de relacions versió/fitxer: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Total de relacions versió/fitxer: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Total dels mapes aportats: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Total de cadenes globals: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Total de l'espai per a dependències de versió: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Total de l'espai desperdiciat: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Total de l'espai atribuit a: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "El fitxer %s del paquet està desincronitzat."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Heu de donar exactament un patró"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "No s'han trobat paquets"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Fitxers de paquets:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  "Memòria cau no sincronitzada, no es pot fer x-ref a un fitxer del paquet"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Paquets etiquetats:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(no trobat)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Instal·lat: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(cap)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Candidat: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Etiqueta del paquet: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Taula de versió:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s per a %s %s compilat el %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -303,7 -303,7 +313,7 @@@ msgstr "
  "  -c=? Llegeix aquest fitxer de configuració\n"
  "  -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "No es pot escriure en %s"
@@@ -426,127 -426,114 +436,127 @@@ msgstr "No s'ha trobat cap selecció
  msgid "Some files are missing in the package file group `%s'"
  msgstr "No es troben alguns fitxers dins del grup de fitxers del paquet `%s'"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "La base de dades està corrompuda, fitxer renomenat a %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "La BD és vella, s'està intentant actualitzar %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +"El format de la base de dades és invàlid. Si heu actualitzat des d'una "
 +"versió més antiga de l'apt, eliminieu i torneu a crear la base de dades."
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "No es pot obrir el fitxer de DB %s: %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "La data del fitxer ha canviat %s"
 +msgid "Failed to stat %s"
 +msgstr "No es pot determinar l'estat de %s"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "Arxiu sense registre de control"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "No es pot aconseguir un cursor"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "A: No es pot llegir el directori %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "A: No es pot veure l'estat %s\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "E: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "A: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "E: Els errors s'apliquen al fitxer "
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "No s'ha pogut resoldre %s"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "L'arbre està fallant"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "No s'ha pogut obrir %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr " DeLink %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "No s'ha pogut llegir l'enllaç %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "No s'ha pogut alliberar %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** No s'ha pogut enllaçar %s a %s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " DeLink s'ha arribat al límit de %sB.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "No es pot determinar l'estat de %s"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "Arxiu sense el camp paquet"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
 -msgstr " %s no té una entrada dominant\n"
 +msgstr "  %s no té una entrada dominant\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
 -msgstr " el mantenidor de %s és %s, no %s\n"
 +msgstr "  el mantenidor de %s és %s, no %s\n"
 +
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr "  %s no té una entrada dominant de font\n"
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr "  %s no té una entrada dominant de binari\n"
  
  #: ftparchive/contents.cc:317
  #, c-format
@@@ -643,79 -630,79 +653,79 @@@ msgstr "S'ha trobat un problema treien
  msgid "Failed to rename %s to %s"
  msgstr "No s'ha pogut canviar el nom de %s a %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "S"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Els següents paquets tenen dependències sense satisfer:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "però està instal·lat %s"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "però s'instal·larà %s"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "però no és instal·lable"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "però és un paquet virtual"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "però no està instal·lat"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "però no serà instal·lat"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " o"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "S'instal·laran els següents paquets NOUS:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "S'ELIMINARAN els següents paquets:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "S'han mantingut els següents paquets:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "S'actualitzaran els següents paquets:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Es DESACTUALITZARAN els següents paquets:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Es canviaran els següents paquets mantinguts:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (per %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -723,146 -710,146 +733,146 @@@ msgstr "
  "AVÍS: Els següents paquets essencials seran eliminats.\n"
  "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu actualitzats, %lu nous a instal·lar, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu reinstal·lats, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu desactualitzats, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu a eliminar i %lu no actualitzats.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu no instal·lats o eliminats completament.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "S'estan corregint les dependències..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " ha fallat."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "No es poden corregir les dependències"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "No es pot minimitzar el joc de versions revisades"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Fet"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Dependències sense satisfer. Proveu-ho usant -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "AVÍS: No es poden autenticar els següents paquets!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "S'ha descartat l'avís d'autenticació.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "No s'ha pogut autenticar alguns paquets"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Hi ha problemes i s'ha usat -y sense --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr ""
  "S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets "
  "trencats!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "No és possible blocar el directori de descàrrega"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "No s'ha pogut llegir la llista de les fonts."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  "Què estrany... les mides no coincideixen, informeu a apt@packages.debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Es necessita obtenir %sB/%sB d'arxius.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Es necessita obtenir %sB d'arxius.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "Després de desempaquetar s'usaran %sB d'espai en disc addicional.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Després de desempaquetar s'alliberaran %sB d'espai en disc.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "No s'ha pogut determinar l'espai lliure en %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "No teniu prou espai lliure en %s."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "Es va especificar Trivial Only però aquesta operació no és trivial."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Sí, fes el que et dic!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -873,28 -860,28 +883,28 @@@ msgstr "
  "Per a continuar escriviu la frase «%s»\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Avortat."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Voleu continuar [S/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "No s'ha pogut obtenir %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Alguns fitxers no s'han pogut descarregar"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Descàrrega completa i en mode de només descàrrega"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -902,48 -889,48 +912,48 @@@ msgstr "
  "No es poden descarregar alguns arxius, potser executant apt-get update o "
  "intenteu-ho amb --fix-missing."
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing i medi d'intercanvi actualment no estan suportats"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "No es poden corregir els paquets que falten."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "S'està avortant la instal·lació."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Nota: s'està seleccionant %s en comptes de %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  "S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "El paquet %s no està instal·lat, així que no s'eliminarà\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "El paquet %s és un paquet virtual proveït per:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Instal·lat]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Necessiteu seleccionar-ne un explícitament per a instal·lar-lo."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -954,50 -941,50 +964,50 @@@ msgstr "
  "en fa referència. Això normalment vol dir que el paquet falta,\n"
  "s'ha tornat obsolet o només és disponible des d'una altra font.\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Tot i que els següents paquets el reemplacen:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "El paquet %s no té candidat d'instal·lació"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr ""
  "No es possible la reinstal·lació del paquet %s, no es pot descarregar.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s ja es troba en la versió més recent.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "No s'ha trobat la versió puntual «%s» per a «%s»"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "No s'ha trobat la versió «%s» per a «%s»"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Versió seleccionada %s (%s) per a %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "L'ordre update no pren arguments"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "No es pot blocar el directori de la llista"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1005,25 -992,25 +1015,45 @@@ msgstr "
  "No es poden descarregar alguns fitxers índex, s'han ignorat o en el seu lloc "
  "s'han usat els antics."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "La següent informació pot ajudar-vos a resoldre la situació:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr ""
++"S'ha produït un error intern, el solucionador de problemes ha trencat coses"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Error intern, AllUpgrade ha trencat coses"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "No s'ha pogut trobar el paquet %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1031,7 -1018,7 +1061,7 @@@ msgstr "
  "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o "
  "especifiqueu una solució)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1043,7 -1030,7 +1073,7 @@@ msgstr "
  "unstable i alguns paquets requerits encara no han estat creats o bé\n"
  "encara no els hi han afegit."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1053,124 -1040,124 +1083,120 @@@ msgstr "
  "probable que el paquet no sigui instal·lable i que s'hagi d'emetre\n"
  "un informe d'error en contra d'aquest per a arxivar-lo."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "La següent informació pot ajudar-vos a resoldre la situació:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Paquets trencats"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "S'instal·laran els següents paquets extres:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Paquets suggerits:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Paquets recomanats:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "S'està calculant l'actualització... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Ha fallat"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Fet"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr ""
  "S'ha produït un error intern, el solucionador de problemes ha trencat coses"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "Haureu d'especificar un paquet de codi font per a descarregar"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "No es pot trobar un paquet de fonts per a %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "S'està ometent el fitxer ja descarregat «%s»\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "No teniu prou espai lliure en %s"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Es necessita descarregar %sB/%sB d'arxius font.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Es necessita descarregar %sB d'arxius font.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Font descarregada %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "No s'ha pogut descarregar alguns arxius."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr ""
  "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "L'ordre de construir «%s» ha fallat.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Ha fallat el procés fill"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "S'ha d'especificar un paquet per a verificar les dependències de construcció "
  "per a"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr ""
  "No es pot obtenir informació sobre les dependències de construcció per a %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s no té dependències de construcció.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1179,7 -1166,7 +1205,7 @@@ msgstr "
  "La dependència %s en %s no es pot satisfer per que no es pot trobar el "
  "paquet %s"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1188,32 -1175,32 +1214,32 @@@ msgstr "
  "La dependència %s per a %s no es pot satisfer per que cap versió del paquet %"
  "s pot satisfer els requeriments de versions"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s "
  "és massa nou"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "No s'han pogut satisfer les dependències de construcció per a %s"
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "No es poden processar les dependències de construcció"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Mòduls suportats:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1398,19 -1385,19 +1424,19 @@@ msgstr "S'està fusionant la informaciÃ
  msgid "Failed to create pipes"
  msgstr "No es poden crear els conductes"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "No es pot executar el gzip "
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Arxiu corromput"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "La suma de comprovació de tar ha fallat, arxiu corromput"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Capçalera TAR desconeguda del tipus %u, membre %s"
@@@ -1557,9 -1544,9 +1583,9 @@@ msgstr "
  "fitxers"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "S'està llegint la llista de paquets"
  
@@@ -1692,12 -1679,12 +1718,14 @@@ msgstr "No s'ha trobat el disc
  msgid "File not found"
  msgstr "Fitxer no trobat"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "L'estat ha fallat"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "No s'ha pogut establir el temps de modificació"
  
@@@ -1826,7 -1813,7 +1854,7 @@@ msgstr "S'ha esgotat el temps de connex
  msgid "Unable to accept connection"
  msgstr "No es pot acceptar la connexió"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Problema escollint el fitxer"
  
@@@ -1903,51 -1890,49 +1931,51 @@@ msgstr "S'ha produït un error tempora
  #: methods/connect.cc:176
  #, c-format
  msgid "Something wicked happened resolving '%s:%s' (%i)"
 -msgstr "Ha passat alguna cosa estranya en resoldre '%s:%s' (%i)"
 +msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i)"
  
  #: methods/connect.cc:223
  #, c-format
  msgid "Unable to connect to %s %s:"
  msgstr "No es pot connectar amb %s %s:"
  
 -#: methods/gpgv.cc:64
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:65
 +#, c-format
  msgid "Couldn't access keyring: '%s'"
 -msgstr "No s'ha pogut resoldre '%s'"
 +msgstr "No s'ha pogut accedir a l'anell de claus: «%s»"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr ""
  "E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està "
  "sortint."
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
  "Error intern: La signatura és correcta, però no s'ha pogut determinar "
  "l'emprempta digital de la clau!"
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr "S'ha trobat almenys una signatura invàlida."
  
 -#: methods/gpgv.cc:207
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:213
 +#, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 -msgstr " per a verificar la signatura (està instal·lat el gnupg?)"
 +msgstr ""
 +"No s'ha pogut executar «%s» per a verificar la signatura (està instal·lat el "
 +"gnupg?)"
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr "S'ha produït un error desconegut en executar el gpgv"
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
  msgstr "Les següents signatures són invàlides:\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
@@@ -1955,86 -1940,86 +1983,86 @@@ msgstr "
  "Les següents signatures no s'han pogut verificar perquè la clau pública no "
  "està disponible:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "No s'ha pogut obrir un conducte per a %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Error llegint des del procés %s"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "S'estan esperant les capçaleres"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "S'ha aconseguit una sola línia de capçalera més de %u caràcters"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Línia de capçalera incorrecta"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "El servidor http ha enviat una capçalera de resposta no vàlida"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "El servidor http ha enviat una capçalera de Content-Length no vàlida"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "El servidor http ha enviat una capçalera de Content-Range no vàlida"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "Aquest servidor http té el suport d'abast trencat"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Format de la data desconegut"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Ha fallat la selecció"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Connexió finalitzada"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Error escrivint en el fitxer d'eixida"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Error escrivint en el fitxer"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Error escrivint en el fitxer"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Error llegint, el servidor remot ha tancat la connexió"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Error llegint des del servidor"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Capçalera de dades no vàlida"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Ha fallat la connexió"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Error intern"
  
@@@ -2047,7 -2032,7 +2075,7 @@@ msgstr "No es pot transferir un fitxer 
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "No s'ha pogut crear un mapa de memòria de %lu octets"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "No s'ha trobat la selecció %s"
@@@ -2107,12 -2092,12 +2135,12 @@@ msgstr "Error sintàctic %s:%u: Directr
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Error sintàctic %s:%u: Text extra al final del fitxer"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Error!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Fet"
@@@ -2244,93 -2229,93 +2272,110 @@@ msgstr "Ha hagut un problema en desenll
  msgid "Problem syncing the file"
  msgstr "Ha hagut un problema en sincronitzar el fitxer"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Memòria cau de paquets és buida"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "El fitxer de memòria cau de paquets està corromput"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "El fitxer de memòria cau de paquets és una versió incompatible"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Aquest APT no suporta el sistema de versions '%s'"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "La memòria cau de paquets fou creada per a una arquitectura diferent"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Depén"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Predepén"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Suggereix"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Recomana"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Entra en conflicte"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Reemplaça"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Fa obsolet"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "important"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "requerit"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "estàndard"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "opcional"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "S'està construint l'arbre de dependències"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Versions candidates"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Dependències que genera"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "S'està fusionant la informació disponible"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "No s'ha pogut obrir %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "No s'ha pogut escriure el fitxer %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "No es pot analitzar el fitxer del paquet %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "No es pot analitzar el fitxer del paquet %s (2)"
@@@ -2365,7 -2350,7 +2410,7 @@@ msgstr "Línia %lu malformada en la lli
  msgid "Opening %s"
  msgstr "S'està obrint %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "La línia %u és massa llarga en la llista de fonts %s."
@@@ -2402,14 -2387,14 +2447,14 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "El tipus de fitxer índex '%s', no està suportat"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  "El paquet %s necessita ser reinstal·lat, però no se li pot trobar un arxiu."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2417,7 -2402,7 +2462,7 @@@ msgstr "
  "Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat "
  "causat per paquets mantinguts."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  "No es poden corregir els problemes, teniu paquets mantinguts que estan "
@@@ -2436,14 -2421,14 +2481,14 @@@ msgstr "Falta el directori d'arxiu %spa
  #. only show the ETA if it makes sense
  #. two days
  #: apt-pkg/acquire.cc:823
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li (%s remaining)"
 -msgstr "S'està baixant el fitxer %li de %li (falten %s)"
 +msgstr "S'està obtenint el fitxer %li de %li (falten %s)"
  
  #: apt-pkg/acquire.cc:825
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li"
 -msgstr "S'està llegint el llistat de fitxers"
 +msgstr "S'està obtenint el fitxer %li de %li"
  
  #: apt-pkg/acquire-worker.cc:113
  #, c-format
@@@ -2460,12 -2445,12 +2505,12 @@@ msgstr "El mètode %s no s'ha iniciat c
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "El sistema d'empaquetament '%s' no està suportat"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat."
  
@@@ -2501,104 -2486,103 +2546,121 @@@ msgstr "No s'ha entès el pin de tipus 
  msgid "No priority (or zero) specified for pin"
  msgstr "No hi ha prioritat especificada per al pin (o és zero)"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "La memòria cau té un sistema de versions incompatible"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "S'ha produït un error durant el processament de %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "S'ha produït un error durant el processament de %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "S'ha produït un error durant el processament de %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "S'ha produït un error durant el processament de %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "S'ha produït un error durant el processament de %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "S'ha produït un error durant el processament de %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr "Uau, heu excedit el nombre de paquets dels que aquest APT és capaç."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  "Uau, heu excedit el nombre de versions de les que aquest APT és capaç. "
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr ""
++"Uau, heu excedit el nombre de versions de les que aquest APT és capaç. "
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  "Uau, heu excedit el nombre de dependències de les que aquest APT és capaç."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "S'ha produït un error durant el processament de %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr ""
  "S'ha produït un error durant el processament de %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  "No s'ha trobat el paquet %s %s en processar les dependències del fitxer"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "No s'ha pogut llegir la llista de paquets font %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "S'estan recollint els fitxers que proveeixen"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "Error d'E/S en desar la memòria cau de la font"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "Suma MD5 diferent"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2608,7 -2592,7 +2670,7 @@@ msgstr "
  "significar que haureu d'arreglar aquest paquet manualment (segons "
  "arquitectura)."
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2617,7 -2601,7 +2679,7 @@@ msgstr "
  "No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu "
  "d'arreglar aquest paquet manualment."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
@@@ -2625,7 -2609,7 +2687,7 @@@ msgstr "
  "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
  "per al paquet %s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "La mida no concorda"
  
@@@ -2634,7 -2618,7 +2696,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "El camp del proveïdor %s no té una empremta digital"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2643,47 -2627,47 +2705,49 @@@ msgstr "
  "S'està utilitzant el punt de muntatge de CD-ROM %s\n"
  "S'està muntant el CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "S'està identificant..."
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "S'ha emmagatzemat l'etiqueta: %s\n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "S'està utilitzant el punt de muntatge de CD-ROM %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "S'està desmuntant el CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "S'està esperant al disc...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "S'està muntant el CD-ROM...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "S'està analitzant el disc per a fitxers d'índex...\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "S'han trobat %i índex de paquets, %i índex de fonts i %i signatures\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Aquest no és un nom vàlid, torneu-ho a provar.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2692,38 -2676,38 +2756,38 @@@ msgstr "
  "El disc es diu:\n"
  "«%s»\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "S'estan copiant les llistes de paquets..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "S'està escrivint una nova llista de fonts\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Les entrades de la llista de fonts per a aquest disc són:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "S'esta desmuntant el CD-ROM..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "S'han escrit %i registres.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "S'han escrit %i registres, on falten %i fitxers.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2733,7 -2717,7 +2797,7 @@@
  #: apt-pkg/deb/dpkgpm.cc:358
  #, c-format
  msgid "Preparing %s"
 -msgstr "S'està preparant %s"
 +msgstr "S'està preparant el paquet %s"
  
  #: apt-pkg/deb/dpkgpm.cc:359
  #, c-format
@@@ -2743,49 -2727,67 +2807,59 @@@ msgstr "S'està desempaquetant %s
  #: apt-pkg/deb/dpkgpm.cc:364
  #, c-format
  msgid "Preparing to configure %s"
 -msgstr "S'està preparant per a configurar %s"
 +msgstr "S'està preparant per a configurar el paquet %s"
  
  #: apt-pkg/deb/dpkgpm.cc:365
  #, c-format
  msgid "Configuring %s"
 -msgstr "S'està configurant %s"
 +msgstr "S'està configurant el paquet %s"
  
  #: apt-pkg/deb/dpkgpm.cc:366
  #, c-format
  msgid "Installed %s"
 -msgstr "S'ha instal·lat %s"
 +msgstr "S'ha instal·lat el paquet %s"
  
  #: apt-pkg/deb/dpkgpm.cc:371
  #, c-format
  msgid "Preparing for removal of %s"
 -msgstr "S'està preparant per a l'eliminació de %s"
 +msgstr "S'està preparant per a l'eliminació del paquet %s"
  
  #: apt-pkg/deb/dpkgpm.cc:372
  #, c-format
  msgid "Removing %s"
 -msgstr "S'està eliminant %s"
 +msgstr "S'està eliminant el paquet %s"
  
  #: apt-pkg/deb/dpkgpm.cc:373
  #, c-format
  msgid "Removed %s"
 -msgstr "S'ha eliminat %s"
 +msgstr "S'ha eliminat el paquet %s"
  
  #: apt-pkg/deb/dpkgpm.cc:378
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing to completely remove %s"
 -msgstr "S'està preparant per a configurar %s"
 +msgstr "S'està preparant per a eliminar completament el paquet %s"
  
  #: apt-pkg/deb/dpkgpm.cc:379
 -#, fuzzy, c-format
 +#, c-format
  msgid "Completely removed %s"
 -msgstr "No es pot eliminar %s"
 +msgstr "S'ha eliminat completament el paquet %s"
 +
++#: methods/rred.cc:219
++#, fuzzy
++msgid "Could not patch file"
++msgstr "No s'ha pogut obrir el fitxer %s"
+ 
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "La connexió s'ha tancat prematurament"
  
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
 -msgstr ""
 -
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr " %s no té una entrada dominant\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr " %s no té una entrada dominant\n"
 -
 -#: methods/rred.cc:219
++#: apt-pkg/acquire-item.cc:1097
+ #, fuzzy
 -msgid "Could not patch file"
 -msgstr "No s'ha pogut obrir el fitxer %s"
++msgid "There is no public key available for the following key IDs:\n"
++msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n"
++
 +#~ msgid "File date has changed %s"
 +#~ msgstr "La data del fitxer ha canviat %s"
  
  #~ msgid "Reading file list"
  #~ msgstr "S'està llegint la llista de fitxers"
diff --combined po/cs.po
index ab7fc07b9,e2905b107..5c6b177f0
--- a/po/cs.po
+++ b/po/cs.po
@@@ -2,158 -2,157 +2,168 @@@
  # This file is put in the public domain.
  # Miroslav Kure <kurem@debian.cz>, 2004-2006.
  #
 +#
  msgid ""
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-05-27 13:46+0200\n"
 -"PO-Revision-Date: 2006-05-14 18:36+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
 +"PO-Revision-Date: 2006-10-04 18:53+0200\n"
  "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
  "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Balík %s verze %s má nesplněné závislosti:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Nemohu najít balík %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Celkem názvů balíků: "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Normálních balíků: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Čistě virtuálních balíků: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Jednoduchých virtuálních balíků: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Smíšených virtuálních balíků: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Chybějících: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Celkem různých verzí: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Celkem různých verzí: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Celkem závislostí: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Celkem vztahů ver/soubor: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Celkem vztahů ver/soubor: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Celkem poskytnutých mapování: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Celkem globovaných řetězců: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Celkem místa závislých verzí: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Celkem jalového místa: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Celkem přiřazeného místa: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Soubor balíku %s je špatně synchronizovaný."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Musíte zadat právě jeden vzor"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Nebyly nalezeny žádné balíky"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Soubory balíku:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "Cache není synchronizovaná, nemohu se odkázat na soubor balíku"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Vypíchnuté balíky:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(nenalezeno)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Instalovaná verze: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(žádná)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Kandidát: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Vypíchnutý balík: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Tabulka verzí:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s pro %s %s zkompilován na %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -299,7 -298,7 +309,7 @@@ msgstr "
  "  -c=? Načte tento konfigurační soubor\n"
  "  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Nemohu zapsat do %s"
@@@ -421,128 -420,115 +431,128 @@@ msgstr "Žádný výběr nevyhověl
  msgid "Some files are missing in the package file group `%s'"
  msgstr "Některé soubory chybí v balíkovém souboru skupiny %s"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "DB je porušená, soubor přejmenován na %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "DB je stará, zkouším aktualizovat %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +"Formát databáze je neplatný. Pokud jste přešli ze starší verze apt, databázi "
 +"prosím odstraňte a poté ji znovu vytvořte."
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "Nemohu otevřít DB soubor %s: %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "Datum souboru se změnil %s"
 +msgid "Failed to stat %s"
 +msgstr "Nemohu vyhodnotit %s"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "Archiv nemá kontrolní záznam"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "Nemohu získat kurzor"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "W: Nemohu číst adresář %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "W: Nemohu vyhodnotit %s\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "E: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "W: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "E: Chyby se týkají souboru "
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "Chyba při zjišťování %s"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "Průchod stromem selhal"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "Nelze otevřít %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr "Odlinkování %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "Nemohu přečíst link %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "Nemohu odlinkovat %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** Nezdařilo se slinkovat %s s %s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " Odlinkovací limit %sB dosažen.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "Nemohu vyhodnotit %s"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "Archiv nemá pole Package"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr " %s nemá žádnou položku pro override\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "  správce %s je %s, ne %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr " %s nemá žádnou zdrojovou položku pro override\n"
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr " %s nemá ani žádnou binární položku pro override\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -638,79 -624,79 +648,79 @@@ msgstr "Problém s odlinkováním %s
  msgid "Failed to rename %s to %s"
  msgstr "Selhalo přejmenování %s na %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "Y"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Chyba při kompilaci regulárního výrazu - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Následující balíky mají nesplněné závislosti:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "ale %s je nainstalován"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "ale %s se bude instalovat"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "ale nedá se nainstalovat"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "ale je to virtuální balík"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "ale není nainstalovaný"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "ale nebude se instalovat"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " nebo"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Následující NOVÉ balíky budou nainstalovány:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Následující balíky budou ODSTRANĚNY:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Následující balíky jsou podrženy v aktuální verzi:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Následující balíky budou aktualizovány:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Následující balíky budou DEGRADOVÁNY:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Následující podržené balíky budou změněny:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (kvůli %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -718,144 -704,144 +728,144 @@@ msgstr "
  "VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n"
  "Pokud přesně nevíte, co děláte, NEDĚLEJTE to!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu aktualizováno, %lu nově instalováno, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu reinstalováno, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu degradováno, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu k odstranění a %lu neaktualizováno.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Opravuji závislosti..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " selhalo."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Nemohu opravit závislosti"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Nemohu minimalizovat sadu pro aktualizaci"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Hotovo"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "Pro opravení můžete spustit `apt-get -f install'."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Nesplněné závislosti. Zkuste použít -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "Autentizační varování potlačeno.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Instalovat tyto balíky bez ověření [y/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Některé balíky nemohly být autentizovány"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Nemohu zamknout adresář pro stahování"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Nelze přečíst seznam zdrojů."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  "Jak podivné... velikosti nesouhlasí, ohlaste to na apt@packages.debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Potřebuji stáhnout %sB/%sB archivů.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Potřebuji stáhnout %sB archivů.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "Po rozbalení bude na disku použito dalších %sB.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Po rozbalení bude na disku uvolněno %sB.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Nemohu určit volné místo v %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "V %s nemáte dostatek volného místa."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "Udáno 'pouze triviální', ovšem toto není triviální operace."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Ano, udělej to tak, jak říkám!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -866,28 -852,28 +876,28 @@@ msgstr "
  "Pro pokračování opište frázi '%s'\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Přerušeno."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Chcete pokračovat [Y/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Selhalo stažení %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Některé soubory nemohly být staženy"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Stahování dokončeno v režimu pouze stáhnout"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -895,47 -881,47 +905,47 @@@ msgstr "
  "Nemohu stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --"
  "fix-missing?"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing a výměna média nejsou momentálně podporovány"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Nemohu opravit chybějící balíky."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Přerušuji instalaci."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Pozn: Vybírám %s místo %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr "Přeskakuji %s, protože je již nainstalován.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Balík %s není nainstalován, nelze tedy odstranit\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Balík %s je virtuální balík poskytovaný:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr "[Instalovaný]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Měli byste explicitně vybrat jeden k instalaci."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -946,49 -932,49 +956,49 @@@ msgstr "
  "To může znamenat že balík chybí, byl zastarán, nebo je dostupný\n"
  "pouze z jiného zdroje\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Nicméně následující balíky jej nahrazují:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Balík %s nemá kandidáta pro instalaci"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "Reinstalace %s není možná, protože nelze stáhnout.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s je již nejnovější verze.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Vydání '%s' pro '%s' nebylo nalezeno"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Verze '%s' pro '%s' nebyla nalezena"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Vybraná verze %s (%s) pro %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "Příkaz update neakceptuje žádné argumenty"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Nemohu uzamknout list adresář"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -996,25 -982,25 +1006,44 @@@ msgstr "
  "Některé indexové soubory se nepodařilo stáhnout, jsou ignorovány, nebo jsou "
  "použity starší verze."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Nemohu najít balík %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Pozn: vybírám %s pro regulární výraz '%s'\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "Pro opravení následujících můžete spustit `apt-get -f install':"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1022,7 -1008,7 +1051,7 @@@ msgstr "
  "Nesplněné závislosti. Zkuste spustit 'apt-get -f install' bez balíků (nebo "
  "navrhněte řešení)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1033,7 -1019,7 +1062,7 @@@ msgstr "
  "nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n"
  "vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1043,128 -1029,128 +1072,124 @@@ msgstr "
  "balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n"
  "(bug report)."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Poškozené balíky"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Následující extra balíky budou instalovány:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Navrhované balíky:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Doporučované balíky:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Propočítávám aktualizaci... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Selhalo"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Hotovo"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Nemohu najít zdrojový balík pro %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Přeskakuji dříve stažený soubor '%s'\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Na %s nemáte dostatek volného místa"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Stáhnout zdroj %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Stažení některých archivů selhalo."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Příkaz pro rozbalení '%s' selhal.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Zkontrolujte, zda je nainstalován balíček 'dpkg-dev'.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Příkaz pro sestavení '%s' selhal.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Synovský proces selhal"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti "
  "pro sestavení"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Nemohu získat závislosti pro sestavení %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s nemá žádné závislosti pro sestavení.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1173,31 -1159,31 +1198,31 @@@ msgstr "
  "%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku "
  "%s, která odpovídá požadavku na verzi"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Selhalo splnění %s závislosti pro %s: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Závislosti pro sestavení %s nemohly být splněny."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Chyba při zpracování závislostí pro sestavení"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Podporované moduly:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1375,19 -1361,19 +1400,19 @@@ msgstr "Slučuji dostupné informace
  msgid "Failed to create pipes"
  msgstr "Selhalo vytvoření roury"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "Selhalo spuštění gzipu "
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Porušený archiv"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Kontrolní součet taru selhal, archiv je poškozený"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Neznámá hlavička TARu typ %u, člen %s"
@@@ -1532,9 -1518,9 +1557,9 @@@ msgid "The info and temp directories ne
  msgstr "Adresáře info a temp musí být na stejném souborovém systému"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Čtu seznamy balíků"
  
@@@ -1667,12 -1653,12 +1692,14 @@@ msgstr "Disk nebyl nalezen.
  msgid "File not found"
  msgstr "Soubor nebyl nalezen"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Selhalo vyhodnocení"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Nelze nastavit čas modifikace"
  
@@@ -1800,7 -1786,7 +1827,7 @@@ msgstr "Spojení datového socketu vypr
  msgid "Unable to accept connection"
  msgstr "Nemohu přijmout spojení"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Problém s hashováním souboru"
  
@@@ -1884,39 -1870,39 +1911,39 @@@ msgstr "Něco hodně ošklivého se př
  msgid "Unable to connect to %s %s:"
  msgstr "Nemohu se připojit k %s %s:"
  
 -#: methods/gpgv.cc:64
 +#: methods/gpgv.cc:65
  #, c-format
  msgid "Couldn't access keyring: '%s'"
  msgstr "Nemohu přistoupit ke klíčence: '%s'"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr "E: Seznam argumentů Acquire::gpgv::Options je příliš dlouhý. Končím."
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!"
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr "Byl zaznamenán nejméně jeden neplatný podpis. "
  
 -#: methods/gpgv.cc:207
 +#: methods/gpgv.cc:213
  #, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
  msgstr ""
  "Nepodařilo se spustit '%s' pro ověření podpisu (je gnupg nainstalováno?)"
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr "Neznámá chyba při spouštění gpgv"
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
  msgstr "Následující podpisy jsou neplatné:\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
@@@ -1924,86 -1910,86 +1951,86 @@@ msgstr "
  "Následující podpisy nemohly být ověřeny, protože není dostupný veřejný "
  "klíč:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Nemohu otevřít rouru pro %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Chyba čtení z procesu %s"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Čekám na hlavičky"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Získal jsem jednu řádku hlavičky přes %u znaků"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Chybná hlavička"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "Http server poslal neplatnou hlavičku odpovědi"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "Http server poslal neplatnou hlavičku Content-Length"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "Http server poslal neplatnou hlavičku Content-Range"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "Tento HTTP server má porouchanou podporu rozsahů"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Neznámý formát data"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Výběr selhal"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Čas spojení vypršel"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Chyba zápisu do výstupního souboru"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Chyba zápisu do souboru"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Chyba zápisu do souboru"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Chyba čtení ze serveru"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Špatné datové záhlaví"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Spojení selhalo"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Vnitřní chyba"
  
@@@ -2016,7 -2002,7 +2043,7 @@@ msgstr "Nemohu provést mmap prázdnéh
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Nešlo mmapovat %lu bajtů"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Výběr %s nenalezen"
@@@ -2077,12 -2063,12 +2104,12 @@@ msgstr "Syntaktická chyba %s:%u: Nepod
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Syntaktická chyba %s:%u: Na konci souboru je zbytečné smetí"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Chyba!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Hotovo"
@@@ -2214,93 -2200,93 +2241,110 @@@ msgstr "Problém při odstraňování s
  msgid "Problem syncing the file"
  msgstr "Problém při synchronizování souboru"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Cache balíků je prázdná"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Cache soubor balíků je poškozen"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Cache soubor balíků je v nekompatibilní verzi"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Tento APT nepodporuje systém pro správu verzí '%s'"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "Cache balíků byla vytvořena pro jinou architekturu"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Závisí na"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Předzávisí na"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Navrhuje"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Doporučuje"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Koliduje s"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Nahrazuje"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Zastarává"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "důležitý"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "vyžadovaný"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "standardní"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "volitelný"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Vytvářím strom závislostí"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Kandidátské verze"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Generování závislostí"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Slučuji dostupné informace"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Nelze otevřít %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Selhal zápis souboru %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Nelze zpracovat soubor %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Nelze zpracovat soubor %s (2)"
@@@ -2335,7 -2321,7 +2379,7 @@@ msgstr "Zkomolený řádek %lu v seznam
  msgid "Opening %s"
  msgstr "Otevírám %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý."
@@@ -2371,13 -2357,13 +2415,13 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Indexový typ souboru '%s' není podporován"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr "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:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2385,7 -2371,7 +2429,7 @@@ msgstr "
  "Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno "
  "podrženými balíky."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  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."
  
@@@ -2426,12 -2412,12 +2470,12 @@@ msgstr "Metoda %s nebyla spuštěna spr
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr "Vložte prosím disk nazvaný '%s' do mechaniky '%s' a stiskněte enter."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Balíčkovací systém '%s' není podporován"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Nebylo možno určit vhodný typ balíčkovacího systému"
  
@@@ -2466,102 -2452,101 +2510,118 @@@ msgstr "Nerozumím vypíchnutí typu %s
  msgid "No priority (or zero) specified for pin"
  msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Cache má nekompatibilní systém správy verzí"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Při zpracování %s se objevila chyba (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Při zpracování %s se objevila chyba (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Při zpracování %s se objevila chyba (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Při zpracování %s se objevila chyba (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Při zpracování %s se objevila chyba (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Při zpracování %s se objevila chyba (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Při zpracování %s se objevila chyba (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Při zpracování %s se objevila chyba (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Při zpracování %s se objevila chyba (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  "Wow, překročili jste počet jmen balíků, které tato APT zvládá zpracovat."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "Wow, překročili jste počet verzí, které tato APT zvládá zpracovat."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "Wow, překročili jste počet verzí, které tato APT zvládá zpracovat."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  "Wow, překročili jste počet závislostí, které tato APT zvládá zpracovat."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Chyba při zpracování %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Při zpracování %s se objevila chyba (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "Při zpracování závislostí nebyl nalezen balík %s %s"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Collecting File poskytuje"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "Chyba IO při ukládání zdrojové cache"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "přejmenování selhalo, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "Neshoda MD5 součtů"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2570,7 -2555,7 +2630,7 @@@ msgstr "
  "Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že "
  "tento balík je třeba opravit ručně (kvůli chybějící architektuře)"
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2579,14 -2564,14 +2639,14 @@@ msgstr "
  "Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík "
  "opravit ručně."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Velikosti nesouhlasí"
  
@@@ -2595,7 -2580,7 +2655,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Blok výrobce %s neobsahuje otisk klíče"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2604,47 -2589,47 +2664,49 @@@ msgstr "
  "Používám přípojný bod %s\n"
  "Připojuji CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Rozpoznávám... "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Uložený název: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Používám přípojný bod %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Odpojuji CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Čekám na disk...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Připojuji CD-ROM...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Hledám na disku indexové soubory...\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "Nalezl jsem indexy balíků (%i), indexy zdrojů (%i) a podpisy (%i)\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Nejedná se o platné jméno, zkuste to znovu.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2653,38 -2638,38 +2715,38 @@@ msgstr "
  "Tento disk se nazývá: \n"
  "'%s'\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Kopíruji seznamy balíků..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Zapisuji nový seznam balíků\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Seznamy zdrojů na tomto disku jsou:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Odpojuji CD-ROM..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Zapsal jsem %i záznamů.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Zapsal jsem %i záznamů s chybějícími soubory (%i).\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Zapsal jsem %i záznamů s nesouhlasícími soubory (%i).\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2740,12 -2725,30 +2802,22 @@@ msgstr "Připravuji úplné odstraněnÃ
  msgid "Completely removed %s"
  msgstr "Kompletně odstraněn %s"
  
++#: methods/rred.cc:219
++#, fuzzy
++msgid "Could not patch file"
++msgstr "Nemohu otevřít soubor %s"
++
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Spojení bylo předčasně ukončeno"
  
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
 -msgstr ""
 -
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr " %s nemá žádnou položku pro override\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr " %s nemá žádnou položku pro override\n"
 -
 -#: methods/rred.cc:219
++#: apt-pkg/acquire-item.cc:1097
+ #, fuzzy
 -msgid "Could not patch file"
 -msgstr "Nemohu otevřít soubor %s"
++msgid "There is no public key available for the following key IDs:\n"
++msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n"
++
 +#~ msgid "File date has changed %s"
 +#~ msgstr "Datum souboru se změnil %s"
  
  #~ msgid "Reading file list"
  #~ msgstr "Čtu seznam souborů"
diff --combined po/cy.po
index bfff52391,a603ccb2c..aac381123
--- a/po/cy.po
+++ b/po/cy.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: APT\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-05-27 13:46+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2005-06-06 13:46+0100\n"
  "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
  "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@@ -14,162 -14,162 +14,172 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Ni ellir lleoli'r pecyn %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  #, fuzzy
  msgid "Total package names : "
  msgstr "Cyfanswm Enwau Pecynnau : "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  #, fuzzy
  msgid "  Normal packages: "
  msgstr "  Pecynnau Normal: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  #, fuzzy
  msgid "  Pure virtual packages: "
  msgstr "  Pecynnau Cwbl Rhithwir: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  #, fuzzy
  msgid "  Single virtual packages: "
  msgstr "  Pecynnau Rhithwir Sengl: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  #, fuzzy
  msgid "  Mixed virtual packages: "
  msgstr "  Pecynnau Rhithwir Cymysg: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Ar Goll: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  #, fuzzy
  msgid "Total distinct versions: "
  msgstr "Cyfanswm Fersiynau Gwahanol: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Cyfanswm Fersiynau Gwahanol: "
++
++#: cmdline/apt-cache.cc:295
  #, fuzzy
  msgid "Total dependencies: "
  msgstr "Cyfanswm Dibyniaethau: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  #, fuzzy
  msgid "Total ver/file relations: "
  msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
++
++#: cmdline/apt-cache.cc:302
  #, fuzzy
  msgid "Total Provides mappings: "
  msgstr "Cyfanswm Mapiau Darpariath: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  #, fuzzy
  msgid "Total globbed strings: "
  msgstr "Cyfanswm Llinynau Glob: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  #, fuzzy
  msgid "Total dependency version space: "
  msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  #, fuzzy
  msgid "Total slack space: "
  msgstr "Cyfanswm gofod Slac: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  #, fuzzy
  msgid "Total space accounted for: "
  msgstr "Cyfanswm Gofod Cyfrifwyd: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Rhaid i chi ddarparu un patrwm yn union"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Canfuwyd dim pecyn"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  #, fuzzy
  msgid "Package files:"
  msgstr "Ffeiliau Pecynnau:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  #, fuzzy
  msgid "Pinned packages:"
  msgstr "Pecynnau wedi eu Pinio:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(heb ganfod)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Wedi Sefydlu: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(dim)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Ymgeisydd: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  #, fuzzy
  msgid "  Package pin: "
  msgstr "  Pin Pecyn: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  #, fuzzy
  msgid "  Version table:"
  msgstr "  Tabl Fersiynnau:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  #, fuzzy
  msgid ""
  "Usage: apt-cache [options] command\n"
@@@ -324,7 -324,7 +334,7 @@@ msgstr "
  "  -c=? Darllen y ffeil cyfluniad hwn\n"
  "  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Ni ellir ysgrifennu i %s"
@@@ -449,127 -449,116 +459,127 @@@ msgstr "Dim dewisiadau'n cyfateb
  msgid "Some files are missing in the package file group `%s'"
  msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn  `%s'"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "Ni ellir agor y ffeil DB2 %s: %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "Dyddiad ffeil wedi newid %s"
 +msgid "Failed to stat %s"
 +msgstr "Methodd stat() o %s"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "Does dim cofnod rheoli gan yr archif"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "Ni ellir cael cyrchydd"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "Rh: Ni ellir gwneud stat() o %s\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "G: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "Rh: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "Methwyd datrys %s"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "Methwyd cerdded y goeden"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "Methwyd agor %s"
  
  # FIXME
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr " DatGysylltu %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "Methwyd darllen y cyswllt %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "Methwyd datgysylltu %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** Methwyd cysylltu %s at %s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr "  Tarwyd y terfyn cyswllt %sB.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "Methodd stat() o %s"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "Doedd dim maes pecyn gan yr archif"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr "  Does dim cofnod gwrthwneud gan %s\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "  Cynaliwr %s yw %s nid %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, fuzzy, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 +
 +#: ftparchive/writer.cc:627
 +#, fuzzy, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 +
  #: ftparchive/contents.cc:317
  #, fuzzy, c-format
  msgid "Internal error, could not locate member %s"
@@@ -666,82 -655,82 +676,82 @@@ msgstr "Gwall wrth datgysylltu %s
  msgid "Failed to rename %s to %s"
  msgstr "Methwyd ailenwi %s at %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "I"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Gwall crynhoi patrwm - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "ond mae %s wedi ei sefydlu"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "ond mae %s yn mynd i gael ei sefydlu"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "ond ni ellir ei sefydlu"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "ond mae'n becyn rhithwir"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "ond nid yw wedi ei sefydlu"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "ond nid yw'n mynd i gael ei sefydlu"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " neu"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Caiff y pecynnau canlynol eu TYNNU:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  #, fuzzy
  msgid "The following packages have been kept back:"
  msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  #, fuzzy
  msgid "The following packages will be upgraded:"
  msgstr "Caiff y pecynnau canlynol eu uwchraddio"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  #, fuzzy
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (oherwydd %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  #, fuzzy
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
@@@ -751,147 -740,147 +761,147 @@@ msgstr "
  "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
  "ei wneud!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu wedi ailsefydlu, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu wedi eu israddio, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Yn cywiro dibyniaethau..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " wedi methu."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Ni ellir cywiro dibyniaethau"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Ni ellir bychanu y set uwchraddio"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Wedi Gorffen"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  #, fuzzy
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr ""
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  #, fuzzy
  msgid "Some packages could not be authenticated"
  msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr ""
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  #, fuzzy
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  #, fuzzy
  msgid "Internal error, Ordering didn't finish"
  msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Methwyd darllen y rhestr ffynhonellau."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Mae angen cyrchu %sB o archifau.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, fuzzy, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Does dim digon o le rhydd yn %s gennych"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Does dim digon o le rhydd gennych yn %s."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Ie, gwna fel rydw i'n dweud!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, fuzzy, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -902,29 -891,29 +912,29 @@@ msgstr "
  "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
  " ?]"
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Erthylu."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  #, fuzzy
  msgid "Do you want to continue [Y/n]? "
  msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Methwyd cyrchu %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Methodd rhai ffeiliau lawrlwytho"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -932,49 -921,49 +942,49 @@@ msgstr "
  "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
  "geidio defnyddio --fix-missing?"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Ni ellir cywiro pecynnau ar goll."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  #, fuzzy
  msgid "Aborting install."
  msgstr "Yn Erthylu'r Sefydliad."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Sefydliwyd]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Dylech ddewis un yn benodol i'w sefydlu."
  
  # FIXME: punctuation
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, fuzzy, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -986,49 -975,49 +996,49 @@@ msgstr "
  "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
  "ffeil sources.list.\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1036,27 -1025,27 +1046,46 @@@ msgstr "
  "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
  "rai eu defnyddio yn lle."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
++
++#: cmdline/apt-get.cc:1466
  #, fuzzy
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Methwyd canfod pecyn %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:"
  
  # FIXME
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1065,7 -1054,7 +1094,7 @@@ msgstr "
  "pecyn (neu penodwch ddatrys)"
  
  # FIXME: needs commas
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1078,7 -1067,7 +1107,7 @@@ msgstr "
  "heb gael eu symud allan o Incoming."
  
  # FIXME: commas, wrapping
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1087,122 -1076,122 +1116,118 @@@ msgstr "
  "Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n"
  "yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Pecynnau wedi torri"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Pecynnau a awgrymmir:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Pecynnau a argymhellir:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  #, fuzzy
  msgid "Calculating upgrade... "
  msgstr "Yn Cyfrifo'r Uwchraddiad... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Methwyd"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Wedi Gorffen"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  #, fuzzy
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:2043
  #, fuzzy, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Does dim digon o le rhydd yn %s gennych"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, fuzzy, c-format
  msgid "Fetch source %s\n"
  msgstr "Cyrchu Ffynhonell %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Methwyd cyrchu rhai archifau."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Methodd proses plentyn"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1211,7 -1200,7 +1236,7 @@@ msgstr "
  "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
  "s"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1220,34 -1209,34 +1245,34 @@@ msgstr "
  "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
  "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
  "newydd"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Methwyd prosesu dibyniaethau adeiladu"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  #, fuzzy
  msgid "Supported modules:"
  msgstr "Modylau a Gynhelir:"
  
  # FIXME: split
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  #, fuzzy
  msgid ""
  "Usage: apt-get [options] command\n"
@@@ -1433,20 -1422,20 +1458,20 @@@ msgstr "Yn cyfuno manylion Ar Gael
  msgid "Failed to create pipes"
  msgstr "Methwyd creu pibau"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "Methwyd gweithredu gzip"
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Archif llygredig"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  #, fuzzy
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Methodd swm gwirio Tar, archif llygredig"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Math pennawd TAR anhysbys %u, aelod %s"
@@@ -1595,9 -1584,9 +1620,9 @@@ msgid "The info and temp directories ne
  msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  #, fuzzy
  msgid "Reading package lists"
  msgstr "Yn Darllen Rhestrau Pecynnau"
@@@ -1744,12 -1733,12 +1769,14 @@@ msgstr "Ffeil heb ei ganfod
  msgid "File not found"
  msgstr "Ffeil heb ei ganfod"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Methwyd stat()"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Methwyd gosod amser newid"
  
@@@ -1880,7 -1869,7 +1907,7 @@@ msgstr "Goramserodd cysylltiad y soced 
  msgid "Unable to accept connection"
  msgstr "Methwyd derbyn cysylltiad"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Problem wrth stwnshio ffeil"
  
@@@ -1965,130 -1954,130 +1992,130 @@@ msgstr "Digwyddodd rhywbweth hyll wrth 
  msgid "Unable to connect to %s %s:"
  msgstr "Methwyd cysylltu i %s %s:"
  
 -#: methods/gpgv.cc:64
 +#: methods/gpgv.cc:65
  #, fuzzy, c-format
  msgid "Couldn't access keyring: '%s'"
  msgstr "Methwyd datrys '%s'"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr ""
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr ""
  
 -#: methods/gpgv.cc:207
 +#: methods/gpgv.cc:213
  #, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
  msgstr ""
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr ""
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  #, fuzzy
  msgid "The following signatures were invalid:\n"
  msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
  msgstr ""
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Methwyd agor pibell ar gyfer %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Gwall darllen o broses %s"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Yn aros am benawdau"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Llinell pennawd gwael"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  #, fuzzy
  msgid "The HTTP server sent an invalid reply header"
  msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  #, fuzzy
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  #, fuzzy
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  #, fuzzy
  msgid "This HTTP server has broken range support"
  msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Fformat dyddiad anhysbys"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Methwyd dewis"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Goramserodd y cysylltiad"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Gwall wrth ysgrifennu at ffeil"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Gwall wrth ysgrifennu at y ffeil"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  #, fuzzy
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Gwall wrth ddarllen o'r gweinydd"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  #, fuzzy
  msgid "Bad header data"
  msgstr "Data pennawd gwael"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Methodd y cysylltiad"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Gwall mewnol"
  
@@@ -2101,7 -2090,7 +2128,7 @@@ msgstr "Ni ellir defnyddio mmap() ar ff
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Methwyd gwneud mmap() efo %lu beit"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Ni chanfuwyd y dewis %s"
@@@ -2163,12 -2152,12 +2190,12 @@@ msgstr "Gwall cystrawen %s:%u: Cyfarwyd
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Gwall!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Wedi Gorffen"
@@@ -2304,98 -2293,98 +2331,115 @@@ msgstr "Gwall wrth dadgysylltu'r ffeil
  msgid "Problem syncing the file"
  msgstr "Gwall wrth gyfamseru'r ffeil"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Storfa pecyn gwag"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Mae'r ffeil storfa pecyn yn llygredig"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
  
  # FIXME: capitalisation?
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, fuzzy, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Dibynnu"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "CynDdibynnu"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Awgrymu"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Argymell"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Gwrthdaro"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Amnewid"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Darfodi"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "pwysig"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "angenrheidiol"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "safonnol"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "opsiynnol"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "ychwanegol"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  #, fuzzy
  msgid "Building dependency tree"
  msgstr "Yn Aideladu Coeden Dibyniaeth"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  #, fuzzy
  msgid "Candidate versions"
  msgstr "Fersiynau Posib"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  #, fuzzy
  msgid "Dependency generation"
  msgstr "Cynhyrchaid Dibyniaeth"
  
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Yn cyfuno manylion Ar Gael"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Methwyd agor %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Methwyd ysgrifennu ffeil %s"
++
  # FIXME: number?
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
@@@ -2431,7 -2420,7 +2475,7 @@@ msgstr "
  msgid "Opening %s"
  msgstr "Yn agor %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
@@@ -2468,7 -2457,7 +2512,7 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Ni chynhelir y math ffeil mynegai '%s'"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
@@@ -2476,7 -2465,7 +2520,7 @@@ msgstr "
  "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
  "ei gyfer."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2484,7 -2473,7 +2528,7 @@@ msgstr "
  "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
  "ei achosi gan pecynnau wedi eu dal."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
@@@ -2529,12 -2518,12 +2573,12 @@@ msgstr "
  " '%s'\n"
  "yn y gyrriant '%s' a gwasgwch Enter\n"
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Ni chynhelir y system pecynnu '%s'"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  #, fuzzy
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Ni ellir canfod math system addas"
@@@ -2572,102 -2561,102 +2616,118 @@@ msgstr "Methwyd daeall y math pin %s
  msgid "No priority (or zero) specified for pin"
  msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Mae can y storfa system fersiwn anghyfaddas"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, fuzzy, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, fuzzy, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, fuzzy, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, fuzzy, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, fuzzy, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, fuzzy, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, fuzzy, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  "Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei  drin."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  "Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, fuzzy, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, fuzzy, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Yn Casglu Darpariaethau Ffeil"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "methwyd ailenwi, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "Camgyfatebiaeth swm MD5"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
  msgid "There are no public key available for the following key IDs:\n"
  msgstr ""
  
  # FIXME: case
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2676,7 -2665,7 +2736,7 @@@ msgstr "
  "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
  "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2685,14 -2674,14 +2745,14 @@@ msgstr "
  "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
  "drwsio'r pecyn hyn a law."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Camgyfatebiaeth maint"
  
@@@ -2701,95 -2690,95 +2761,97 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
  "Mounting CD-ROM\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr ""
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  #, fuzzy
  msgid "Waiting for disc...\n"
  msgstr "Yn aros am benawdau"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:647
++#: apt-pkg/cdrom.cc:673
  #, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
  "'%s'\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  #, fuzzy
  msgid "Copying package lists..."
  msgstr "Yn Darllen Rhestrau Pecynnau"
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  #, fuzzy
  msgid "Writing new source list\n"
  msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2844,17 -2833,31 +2906,22 @@@ msgstr "Yn agor y ffeil cyfluniad %s
  msgid "Completely removed %s"
  msgstr "Methwyd dileu %s"
  
++#: methods/rred.cc:219
++#, fuzzy
++msgid "Could not patch file"
++msgstr "Methwyd agor ffeil %s"
++
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Caewyd y cysylltiad yn gynnar"
  
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
++#: apt-pkg/acquire-item.cc:1097
++msgid "There is no public key available for the following key IDs:\n"
+ msgstr ""
+ 
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 -
 -#: methods/rred.cc:219
 -#, fuzzy
 -msgid "Could not patch file"
 -msgstr "Methwyd agor ffeil %s"
 +#~ msgid "File date has changed %s"
 +#~ msgstr "Dyddiad ffeil wedi newid %s"
  
- #, fuzzy
- #~ msgid "Could not patch file"
- #~ msgstr "Methwyd agor ffeil %s"
- 
  #, fuzzy
  #~ msgid "Reading file list"
  #~ msgstr "Yn Darllen Rhestr Ffeiliau"
diff --combined po/da.po
index e4f6af1b3,58de8be96..398edbea4
--- a/po/da.po
+++ b/po/da.po
@@@ -4,162 -4,161 +4,172 @@@
  # Danish messages
  #
  # Claus Hindsgaul <claus_h@image.dk>, 2002,2003, 2004, 2005, 2006.
 +# Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2006.
  msgid ""
  msgstr ""
  "Project-Id-Version: apt-da\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-05-27 13:46+0200\n"
 -"PO-Revision-Date: 2006-01-20 22:23+0100\n"
 -"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 -"Language-Team: Danish <dansk@klid.dk>\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
 +"PO-Revision-Date: 2006-10-06 15:57+0200\n"
 +"Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 +"Language-Team: Danish\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=ISO-8859-1\n"
  "Content-Transfer-Encoding: 8bit\n"
 -"X-Generator: KBabel 1.11.1\n"
 +"X-Generator: KBabel 1.11.4\n"
  "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Pakken %s version %s har en uopfyldt afhængighed:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Kunne ikke lokalisere pakken %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Totale pakkenavne : "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Normale pakker: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Rene virtuelle pakker: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Enkelte virtuelle pakker: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Blandede virtuelle pakker: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Manglende: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Totale forskellige versioner: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Totale forskellige versioner: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Totale afhængigheder: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Totale version/fil-relationer: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Totale version/fil-relationer: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Totale 'tilbyder'-markeringer: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Totalle søgemønsterstrenge: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Total afhængighedsversions-plads: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Total 'Slack'-plads: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Total plads, der kan gøres rede for: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Pakkefilen %s er ude af trit."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Du skal angive nøjagtig ét mønster"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Fandt ingen pakker"
  
  # Overskriften til apt-cache policy,
  # forkorter "Package" væk. CH
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Pakkefiler:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "Mellemlageret er ude af trit, kan ikke krydsreferere en pakkefil"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "'Pinned' pakker:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(ikke fundet)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Installeret: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(ingen)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Kandidat: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Pakke-pin: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Versionstabel:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s for %s %s oversat på %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -306,7 -305,7 +316,7 @@@ msgstr "
  "  -c=? Læs denne opsætningsfil\n"
  "  -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Kunne ikke skrive til %s"
@@@ -428,129 -427,115 +438,129 @@@ msgstr "Ingen valg passede
  msgid "Some files are missing in the package file group `%s'"
  msgstr "Visse filer mangler i pakkefilgruppen '%s'"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "DB var ødelagt, filen omdøbt til %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "DB er gammel, forsøger at opgradere %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +"Databaseformatet er ugyldigt. Hvis du har opgraderet fra en tidligere "
 +"version af apt, så fjern og genskab databasen."
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "Kunne ikke åbne DB-filen %s: %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "Filens dato er ændret %s"
 +msgid "Failed to stat %s"
 +msgstr "Kunne ikke finde %s"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "Arkivet har ingen kontrolindgang"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "Kunne skaffe en markør"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "A: Kunne ikke læse mappen %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "W: Kunne ikke finde finde %s\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "F: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "A: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "F: Fejlene vedrører filen "
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "Kunne ikke omsætte navnet %s"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "Trævandring mislykkedes"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "Kunne ikke åbne %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr " DeLink %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "Kunne ikke 'readlink' %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "Kunne ikke frigøre %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** Kunne ikke lænke %s til %s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " Nåede DeLink-begrænsningen på %sB.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "Kunne ikke finde %s"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "Arkivet havde intet package-felt"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr "  %s har ingen tvangs-post\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "  pakkeansvarlig for %s er %s, ikke %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr "  %s har ingen linje med tilsidesættelse af standard for kildefiler\n"
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr ""
 +"  %s har ingen linje med tilsidesættelse af standard for binøre filer\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -646,79 -631,79 +656,79 @@@ msgstr "Problem under aflænkning af %s
  msgid "Failed to rename %s to %s"
  msgstr "Kunne ikke omdøbe %s til %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "J"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Fejl ved tolkning af regulært udtryk - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Følgende pakker har uopfyldte afhængigheder:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "men %s er installeret"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "men %s forventes installeret"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "men den kan ikke installeres"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "men det er en virtuel pakke"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "men den er ikke installeret"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "men den bliver ikke installeret"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " eller"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Følgende NYE pakker vil blive installeret:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Følgende pakker vil blive AFINSTALLERET:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Følgende pakker er blevet holdt tilbage:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Følgende pakker vil blive opgraderet:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Følgende pakker vil blive NEDGRADERET:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Følgende tilbageholdte pakker vil blive ændret:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (grundet %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -726,143 -711,143 +736,143 @@@ msgstr "
  "ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n"
  "Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu opgraderes, %lu nyinstalleres, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu geninstalleres, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu nedgraderes, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Retter afhængigheder..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " mislykkedes."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Kunne ikke rette afhængigheder"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Kunne ikke minimere opgraderingssættet"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Færdig"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "Du kan muligvis rette dette ved at køre 'apt-get -f install'."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Uopfyldte afhængigheder. Prøv med -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "ADVARSEL: Følgende pakkers autensitet kunne ikke verificeres!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "Autentifikationsadvarsel tilsidesat.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Installér disse pakker uden verifikation (y/N)? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Nogle pakker kunne ikke autentificeres"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Der er problemer og -y blev brugt uden --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Intern fejl. Sortering blev ikke fuldført"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Kunne ikke låse nedhentningsmappen"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Listen med kilder kunne ikke læses."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr "Mystisk.. Størrelserne passede ikke, skriv til apt@packages.debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "%sB/%sB skal hentes fra arkiverne.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "%sB skal hentes fra arkiverne.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "Efter udpakning vil %sB yderligere diskplads være brugt.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Kunne ikke bestemme ledig plads i %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Du har ikke nok ledig plads i %s."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Ja, gør som jeg siger!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -873,28 -858,28 +883,28 @@@ msgstr "
  "For at fortsætte, skal du skrive '%s'\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Afbryder."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Vil du fortsætte [J/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Kunne ikke hente %s %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Nedhentningen af filer mislykkedes"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -902,49 -887,49 +912,49 @@@ msgstr "
  "Kunne ikke hente nogle af arkiverne. Prøv evt. at køre 'apt-get update' "
  "eller prøv med --fix-missing."
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing og medieskift understøttes endnu ikke"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Kunne ikke rette manglende pakker."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Afbryder installationen."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Bemærk, at %s vælges fremfor %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  "Overspringer %s, da den allerede er installeret og opgradering er "
  "deaktiveret.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Pakken %s er ikke installeret, så den afinstalleres ikke\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Pakken %s er en virtuel pakke, der kan leveres af:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Installeret]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Du bør eksplicit vælge en at installere."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -955,49 -940,49 +965,49 @@@ msgstr "
  "anden pakke. Det kan betyde at denne pakke blevet overflødiggjort eller \n"
  "kun kan hentes fra andre kilder\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Dog kan følgende pakker erstatte den:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Pakken %s har ingen installationskandidat"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s er i forvejen den nyeste version.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Udgaven '%s' for '%s' blev ikke fundet"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Versionen '%s' for '%s' blev ikke fundet"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Valgte version %s (%s) af %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "'update'-kommandoen benytter ingen parametre"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Kunne ikke låse listemappen"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1005,25 -990,25 +1015,44 @@@ msgstr "
  "Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle "
  "bruges i stedet."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Intern fejl. Problemløseren ødelagde noget"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Intern fejl, AllUpgrade ødelagde noget"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Kunne ikke finde pakken %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Bemærk, vælger %s som regulært udtryk '%s'\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "Du kan muligvis rette det ved at køre 'apt-get -f install':"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1031,7 -1016,7 +1060,7 @@@ msgstr "
  "Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv "
  "en løsning)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1042,7 -1027,7 +1071,7 @@@ msgstr "
  "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
  "pakker endnu ikke er lavet eller gjort tilgængelige."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1051,119 -1036,119 +1080,115 @@@ msgstr "
  "Siden du kan bad om en enkelt handling, kan pakken højst sandsynligt slet\n"
  "ikke installeres og du bør indsende en fejlrapport for denne pakke."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Ødelagte pakker"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Følgende yderligere pakker vil blive installeret:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Foreslåede pakker:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Anbefalede pakker:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Beregner opgraderingen... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Mislykkedes"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Færdig"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Intern fejl. Problemløseren ødelagde noget"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "Du skal angive mindst én pakke at hente kildeteksten til"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Kunne ikke finde kildetekstpakken for %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Overspringer allerede hentet fil '%s'\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Du har ikke nok ledig plads i %s"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Henter kildetekst %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Nogle arkiver kunne ikke hentes."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Udpakningskommandoen '%s' fejlede.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Opbygningskommandoen '%s' fejlede.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Barneprocessen fejlede"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s har ingen opbygningsafhængigheder.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1171,7 -1156,7 +1196,7 @@@
  msgstr ""
  "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1180,32 -1165,32 +1205,32 @@@ msgstr "
  "%s-afhængigheden for %s kan ikke opfyldes, da ingen af de tilgængelige "
  "udgaver af pakken %s kan tilfredsstille versions-kravene"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for "
  "ny"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Kunne ikke behandler opbygningsafhængighederne"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Understøttede moduler:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1389,19 -1374,19 +1414,19 @@@ msgstr "Sammenfletter tilgængelighedsop
  msgid "Failed to create pipes"
  msgstr "Kunne ikke oprette videreførsler"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "Kunne ikke udføre gzip "
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Ødelagt arkiv"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Tar-tjeksum fejlede, arkivet er ødelagt"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Ukendt TAR-hovedtype %u, element %s"
@@@ -1546,9 -1531,9 +1571,9 @@@ msgid "The info and temp directories ne
  msgstr "Mapperne info og temp skal ligge i samme filsystem"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Indlæser pakkelisterne"
  
@@@ -1682,12 -1667,12 +1707,14 @@@ msgstr "Disk blev ikke fundet.
  msgid "File not found"
  msgstr "Fil blev ikke fundet"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Kunne ikke finde"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Kunne ikke angive ændringstidspunkt"
  
@@@ -1815,7 -1800,7 +1842,7 @@@ msgstr "Tidsudløb på datasokkel-forbind
  msgid "Unable to accept connection"
  msgstr "Kunne ikke acceptere forbindelse"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Problem ved \"hashing\" af fil"
  
@@@ -1899,40 -1884,39 +1926,40 @@@ msgstr "Der skete noget underligt unde
  msgid "Unable to connect to %s %s:"
  msgstr "Kunne ikke forbinde til %s %s:"
  
 -#: methods/gpgv.cc:64
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:65
 +#, c-format
  msgid "Couldn't access keyring: '%s'"
 -msgstr "Kunne ikke omsætte navnet '%s'"
 +msgstr "Kunne ikke tilgå nøgleringent '%s'"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr "F: Argumentlisten fra Acquire::gpgv::Options er for lang. Afslutter."
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
  "Intern fejl: Gyldig signatur, men kunne ikke afgøre nøgle-fingeraftryk?!"
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr "Stødte på mindst én ugyldig signatur."
  
 -#: methods/gpgv.cc:207
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:213
 +#, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 -msgstr " for at verificere signaturen (er gnupg installeret?)"
 +msgstr ""
 +"Kunne ikke køre '%s' for at verificere signaturen (er gnupg installeret?)"
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr "Ukendt fejl ved kørsel af gpgv"
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
  msgstr "Følgende signaturer var ugyldige:\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
@@@ -1940,87 -1924,87 +1967,87 @@@ msgstr "
  "Følgende signaturer kunne ikke verificeret, da den offentlige nøgle ikke er "
  "tilgængelig:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Kunne ikke åbne datarør for %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Læsefejl fra %s-process"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Afventer hoveder"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Fandt en enkelt linje i hovedet på over %u tegn"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Ugyldig linje i hovedet"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "http-serveren sendte et ugyldigt svarhovede"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "http-serveren sendte et ugyldigt Content-Length-hovede"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "http-serveren sendte et ugyldigt Content-Range-hovede"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr ""
  "Denne http-servere har fejlagtig understøttelse af intervaller ('ranges')"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Ukendt datoformat"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Valg mislykkedes"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Tidsudløb på forbindelsen"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Fejl ved skrivning af uddatafil"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Fejl ved skrivning til fil"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Fejl ved skrivning til filen"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Fejl ved læsning fra server"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Ugyldige hoved-data"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Forbindelsen mislykkedes"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Intern fejl"
  
@@@ -2033,7 -2017,7 +2060,7 @@@ msgstr "Kan ikke udføre mmap for en to
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Kunne ikke udføre mmap for %lu byte"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Det valgte %s blev ikke fundet"
@@@ -2093,12 -2077,12 +2120,12 @@@ msgstr "Syntaksfejl %s:%u: Ikke-underst
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Syntaksfejl %s:%u: Overskydende affald i slutningen af filen"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Fejl!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Færdig"
@@@ -2230,93 -2214,93 +2257,110 @@@ msgstr "Fejl ved frigivelse af filen
  msgid "Problem syncing the file"
  msgstr "Problem under synkronisering af fil"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Tomt pakke-mellemlager"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Pakke-mellemlagerets fil er ødelagt"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Pakke-mellemlagerets fil er af en inkompatibel version"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Denne APT understøtter ikke versionssystemet '%s'"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "Pakke-mellemlageret er lavet til en anden arkitektur"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Afhængigheder"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Præ-afhængigheder"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Foreslåede"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Anbefalede"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Konflikter"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Erstatter"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Overflødiggør"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "vigtig"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "krævet"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "standard"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "frivillig"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "ekstra"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Opbygger afhængighedstræ"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Kandidatversioner"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Afhængighedsgenerering"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Sammenfletter tilgængelighedsoplysninger"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Kunne ikke åbne %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Kunne ikke skrive filen %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Kunne ikke tolke pakkefilen %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Kunne ikke tolke pakkefilen %s (2)"
@@@ -2351,7 -2335,7 +2395,7 @@@ msgstr "Ugyldig linje %lu i kildeliste
  msgid "Opening %s"
  msgstr "Åbner %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Linjen %u er for lang i kildelisten %s."
@@@ -2388,14 -2372,14 +2432,14 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Indeksfiler af typen '%s' understøttes ikke"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  "Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2403,7 -2387,7 +2447,7 @@@ msgstr "
  "Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes "
  "tilbageholdte pakker."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  "Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker."
@@@ -2421,14 -2405,14 +2465,14 @@@ msgstr "Arkivmappen %spartial mangler.
  #. only show the ETA if it makes sense
  #. two days
  #: apt-pkg/acquire.cc:823
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li (%s remaining)"
  msgstr "Henter fil %li ud af %li (%s tilbage)"
  
  #: apt-pkg/acquire.cc:825
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li"
 -msgstr "Læser fillisten"
 +msgstr "Henter fil %li ud af %li"
  
  #: apt-pkg/acquire-worker.cc:113
  #, c-format
@@@ -2445,12 -2429,12 +2489,12 @@@ msgstr "Metoden %s startede ikke korrek
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr "Indsæt disken med navnet: '%s' i drevet '%s' og tryk retur."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Pakkesystemet '%s' understøttes ikke"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Kunne ikke bestemme en passende pakkesystemtype"
  
@@@ -2484,103 -2468,102 +2528,119 @@@ msgstr "Kunne ikke forstå pin-type %s
  msgid "No priority (or zero) specified for pin"
  msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Mellemlageret benytter en inkompatibel versionsstyring"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Der skete en fejl under behandlingen af %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Der skete en fejl under behandlingen af %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  "Hold da op! Du nåede over det antal pakkenavne, denne APT kan håndtere."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  "Hold da op! Du nåede over det antal afhængigheder, denne APT kan håndtere."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Der skete en fejl under behandlingen af %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhængigheder"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Kunne ikke finde kildepakkelisten %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Samler filudbud"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "IO-fejl ved gemning af kilde-mellemlageret"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "omdøbning mislykkedes, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "MD5Sum stemmer ikke"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are 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:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2589,7 -2572,7 +2649,7 @@@ msgstr "
  "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
  "nødt til manuelt at reparere denne pakke. (grundet manglende arch)"
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2598,13 -2581,13 +2658,13 @@@ msgstr "
  "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:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Størrelsen stemmer ikke"
  
@@@ -2613,7 -2596,7 +2673,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Leverandørblok %s inderholder intet fingeraftryk"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2622,47 -2605,47 +2682,49 @@@ msgstr "
  "Bruger cdrom-monteringspunktet %s\n"
  "Monterer cdrom\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Identificerer.. "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Gemt mærkat: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Bruger cdrom-monteringspunktet %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Afmonterer cdrom\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Venter på disken...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Monterer cdrom...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Skanner disken for indeksfiler..\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "Fandt %i pakkeindekser, %i kildeindekser og %i signaturer\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Det er ikke et gyldigt navn, prøv igen.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2671,38 -2654,38 +2733,38 @@@ msgstr "
  "Denne disk hedder: \n"
  " %s \n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Kopierer pakkelisterne..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Skriver ny kildeliste\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Denne disk har følgende kildeliste-indgange:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Afmonterer cdrom..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Skrev %i poster.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Skrev %i poster med %i manglende filer.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Skrev %i poster med %i ikke-trufne filer\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n"
@@@ -2748,24 -2731,39 +2810,31 @@@ msgid "Removed %s
  msgstr "Fjernede %s"
  
  #: apt-pkg/deb/dpkgpm.cc:378
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing to completely remove %s"
 -msgstr "Gør klar til at sætte %s op"
 +msgstr "Gør klar til at fjerne %s helt"
  
  #: apt-pkg/deb/dpkgpm.cc:379
 -#, fuzzy, c-format
 +#, c-format
  msgid "Completely removed %s"
 -msgstr "Kunne ikke slette %s"
 +msgstr "Fjernede %s helt"
 +
++#: methods/rred.cc:219
++msgid "Could not patch file"
++msgstr "Kunne ikke påføre filen %s en lap"
+ 
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Forbindelsen lukkedes for hurtigt"
  
- #~ msgid "Could not patch file"
- #~ msgstr "Kunne ikke påføre filen %s en lap"
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
++#: apt-pkg/acquire-item.cc:1097
++#, fuzzy
++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"
  
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr "  %s har ingen tvangs-post\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr "  %s har ingen tvangs-post\n"
 -
 -#: methods/rred.cc:219
 -#, fuzzy
 -msgid "Could not patch file"
 -msgstr "Kunne ikke åbne filen %s"
 +#~ msgid "File date has changed %s"
 +#~ msgstr "Filens dato er ændret %s"
  
  #~ msgid "Reading file list"
  #~ msgstr "Indlæser fillisten"
diff --combined po/de.po
index 0dc85343f,6545535d5..181312d82
--- a/po/de.po
+++ b/po/de.po
@@@ -1,159 -1,159 +1,169 @@@
 -# German messages for the apt suite.
 -# Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.
 -# Michael Piefel <piefel@informatik.hu-berlin.de>, 2001, 2002, 2003, 2004.
 -# Rüdiger Kuhlmann <Uebersetzung@ruediger-kuhlmann.de>, 2002.
 -# 
 +# German messages for the apt suite.
 +# Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.
 +# Michael Piefel <piefel@informatik.hu-berlin.de>, 2001, 2002, 2003, 2004, 2006.
 +# Rüdiger Kuhlmann <Uebersetzung@ruediger-kuhlmann.de>, 2002.
 +# 
  msgid ""
  msgstr ""
 -"Project-Id-Version: apt 0.5.26\n"
 +"Project-Id-Version: apt 0.6.46.2\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-05-27 13:46+0200\n"
 -"PO-Revision-Date: 2005-06-15 18:22+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
 +"PO-Revision-Date: 2006-10-24 11:45+0200\n"
  "Last-Translator: Michael Piefel <piefel@debian.org>\n"
  "Language-Team:  <de@li.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Paket %s Version %s hat eine nichterfüllte Abhängigkeit:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Kann Paket %s nicht finden"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Gesamtzahl an Paketnamen: "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  davon gewöhnliche Pakete: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  davon rein virtuelle Pakete: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  davon einzelne virtuelle Pakete: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  davon gemischte virtuelle Pakete: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  davon fehlend: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Gesamtzahl an unterschiedlichen Versionen: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Gesamtzahl an unterschiedlichen Versionen: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Gesamtzahl an Abhängigkeiten: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Gesamtzahl an Version/Datei-Beziehungen: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Gesamtzahl an Version/Datei-Beziehungen: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Gesamtzahl an Bereitstellungen: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Gesamtzahl an Mustern: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Gesamtmenge an Abhängigkeits/Versionsspeicher: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Gesamtmenge an Slack: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Gesamtmenge an Speicher: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Paketdatei %s ist nicht synchronisiert."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Sie müssen genau ein Muster angeben"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Keine Pakete gefunden"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Paketdateien:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "Cache ist nicht sychron, kann eine Paketdatei nicht querverweisen"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
 -msgstr "Festgehaltene Pakete (»Pin«):"
 +msgstr "Festgehaltene Pakete („Pin“):"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(nicht gefunden)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Installiert:"
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(keine)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Mögliche Pakete:"
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Paketstecknadel: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Versions-Tabelle:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s für %s %s kompiliert am %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -200,29 -200,29 +210,29 @@@ msgstr "
  "APT zu manipulieren und Informationen daraus zu erfragen.\n"
  "\n"
  "Befehle:\n"
 -"   add       - Paket-Datei dem Quellcache hinzufügen\n"
 -"   gencaches - Paket- und Quellcache neu erzeugen\n"
 -"   showpkg   - grundsätzliche Informationen für ein einzelnes Paket zeigen\n"
 -"   showsrc   - Aufzeichnungen zu Quellen zeigen\n"
 -"   stats     - einige grundlegenden Statistiken zeigen\n"
 -"   dump      - gesamte Datei in Kurzform zeigen\n"
 -"   dumpavail - gesamte Datei verfügbarer Pakete ausgeben\n"
 -"   unmet     - unerfüllte Abhängigkeiten zeigen\n"
 -"   search    - in der Paketliste mittels regulären Ausdrucks suchen\n"
 -"   show      - einen lesbaren Datensatz für das Paket zeigen\n"
 -"   depends   - normale Abhängigkeitsinformationen für ein Paket zeigen\n"
 -"   rdepends  - umgekehrte Abhängigkeitsinformationen für ein Paket zeigen\n"
 -"   pkgnames  - alle Paketnamen auflisten\n"
 -"   dotty     - einen Paketgraph zur Verwendung mit GraphViz erzeugen\n"
 -"   xvcg      - einen Paketgraph zur Verwendung mit xvcg erzeugen\n"
 -"   policy    - »policy«-Einstellungen zeigen\n"
 +"   add       – Paket-Datei dem Quellcache hinzufügen\n"
 +"   gencaches – Paket- und Quellcache neu erzeugen\n"
 +"   showpkg   – grundsätzliche Informationen für ein einzelnes Paket zeigen\n"
 +"   showsrc   – Aufzeichnungen zu Quellen zeigen\n"
 +"   stats     – einige grundlegenden Statistiken zeigen\n"
 +"   dump      – gesamte Datei in Kurzform zeigen\n"
 +"   dumpavail – gesamte Datei verfügbarer Pakete ausgeben\n"
 +"   unmet     – unerfüllte Abhängigkeiten zeigen\n"
 +"   search    – in der Paketliste mittels regulären Ausdrucks suchen\n"
 +"   show      – einen lesbaren Datensatz für das Paket zeigen\n"
 +"   depends   – normale Abhängigkeitsinformationen für ein Paket zeigen\n"
 +"   rdepends  – umgekehrte Abhängigkeitsinformationen für ein Paket zeigen\n"
 +"   pkgnames  – alle Paketnamen auflisten\n"
 +"   dotty     – einen Paketgraph zur Verwendung mit GraphViz erzeugen\n"
 +"   xvcg      – einen Paketgraph zur Verwendung mit xvcg erzeugen\n"
 +"   policy    – „policy“-Einstellungen zeigen\n"
  "\n"
  "Optionen:\n"
  "  -h   dieser Hilfe-Text.\n"
  "  -p=? der Paketcache.\n"
  "  -s=? der Quellcache.\n"
  "  -q   Fortschrittsanzeige abschalten\n"
 -"  -i   nur wichtige Abhängigkeiten für den »unmet«-Befehl zeigen\n"
 +"  -i   nur wichtige Abhängigkeiten für den „unmet“-Befehl zeigen\n"
  "  -c=? diese Konfigurationsdatei lesen\n"
  "  -o=? eine beliebige Konfigurations-Option setzen, z. B. -o dir::cache=/"
  "tmp\n"
@@@ -231,8 -231,8 +241,8 @@@
  #: cmdline/apt-cdrom.cc:78
  msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
  msgstr ""
 -"Bitte geben Sie einen Namen für die CD an, wie zum Beispiel »Debian 2.2r1 "
 -"Disk 1«"
 +"Bitte geben Sie einen Namen für die CD an, wie zum Beispiel „Debian 2.2r1 "
 +"Disk 1“"
  
  #: cmdline/apt-cdrom.cc:93
  msgid "Please insert a Disc in the drive and press enter"
@@@ -241,8 -241,7 +251,8 @@@ msgstr "
  
  #: cmdline/apt-cdrom.cc:117
  msgid "Repeat this process for the rest of the CDs in your set."
 -msgstr "Wiederholen Sie dieses Prozedere für Ihre restlichen CDs diese Reihe."
 +msgstr ""
 +"Wiederholen Sie dieses Prozedere für die restlichen CDs in Ihres Satzes."
  
  #: cmdline/apt-config.cc:41
  msgid "Arguments not in pairs"
@@@ -269,8 -268,8 +279,8 @@@ msgstr "
  "lesen.\n"
  "\n"
  "Befehle:\n"
 -"   shell - Shell-Modus\n"
 -"   dump - Die Konfiguration ausgeben\n"
 +"   shell – Shell-Modus\n"
 +"   dump – Die Konfiguration ausgeben\n"
  "\n"
  "Optionen:\n"
  "  -h    Dieser Hilfetext\n"
@@@ -309,7 -308,7 +319,7 @@@ msgstr "
  "  -o=?  Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/"
  "tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Kann nicht nach %s schreiben"
@@@ -343,6 -342,7 +353,6 @@@ msgid "Error processing contents %s
  msgstr "Fehler beim Verarbeiten der Inhaltsdatei %s"
  
  #: ftparchive/apt-ftparchive.cc:556
 -#, fuzzy
  msgid ""
  "Usage: apt-ftparchive [options] command\n"
  "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@@ -398,7 -398,7 +408,7 @@@ msgstr "
  "\n"
  "apt-ftparchive generiert Package-Dateien aus einem Baum von .debs. Die "
  "Package-\n"
 -"Datei enthält die Inhalt aller Kontrollfelder aus jedem Paket sowie einen "
 +"Datei enthält den Inhalt aller Kontrollfelder aus jedem Paket sowie einen "
  "MD5-\n"
  "Hashwert und die Dateigröße. Eine Override-Datei wird unterstützt, um Werte "
  "für\n"
@@@ -410,7 -410,7 +420,7 @@@
  "Override-\n"
  "Datei für Quellen anzugeben.\n"
  "\n"
 -"Die Befehle »packages« und »source« sollten in der Wurzel des Baumes "
 +"Die Befehle „packages“ und „source“ sollten in der Wurzel des Baumes "
  "aufgerufen\n"
  "werden.  BinaryPath sollte auf die Basis der rekursiven Suche zeigen und\n"
  "overridefile sollte die Override-Flags enthalten. Pfadpräfix wird, so\n"
@@@ -419,15 -419,15 +429,15 @@@
  "               dists/potato/main/binary-i386/Packages\n"
  "\n"
  "Optionen:\n"
 -"  -h     Dieser Hilfe-Text.\n"
 -"  --md5  Steuere MD5-Generierung\n"
 -"  -s=?   Override-Datei für Quellen ein\n"
 -"  -q     Ruhig\n"
 -"  -d=?   Optionale Cache-Datenbank auswählen\n"
 +"  -h     dieser Hilfe-Text\n"
 +"  --md5  MD5-Hashes erzeugen\n"
 +"  -s=?   Override-Datei für Quellen\n"
 +"  -q     ruhig\n"
 +"  -d=?   optionale Cache-Datenbank auswählen\n"
  "  --no-delink  Debug-Modus für Delinking setzen\n"
 -"  --contents   Steuere Inhaltsdatei-Generierung\n"
 -"  -c=?   Lese diese Konfigurationsdatei\n"
 -"  -o=?   Setze eine beliebige Konfigurations-Option"
 +"  --contents   Inhaltsdatei erzeugen\n"
 +"  -c=?   diese Konfigurationsdatei lesen\n"
 +"  -o=?   eine beliebige Konfigurations-Option setzen"
  
  #: ftparchive/apt-ftparchive.cc:762
  msgid "No selections matched"
@@@ -436,130 -436,117 +446,130 @@@ msgstr "Keine Auswahl passt
  #: ftparchive/apt-ftparchive.cc:835
  #, c-format
  msgid "Some files are missing in the package file group `%s'"
 -msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«"
 +msgstr "Einige Dateien fehlen in der Paketdateigruppe „%s“"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "DB wurde beschädigt, Datei umbenannt in %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "DB ist alt, versuche %s zu erneuern"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +"DB-Format ist ungültig. Wenn Sie ein Update von einer älteren Version von "
 +"apt gemacht haben, entfernen Sie bitte die Datenbank und erstellen sie neu."
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "Kann DB-Datei %s nicht öffnen: %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "Dateidatum hat sich geändert %s"
 +msgid "Failed to stat %s"
 +msgstr "Kann auf %s nicht zugreifen."
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
 -msgstr "Archiv ist keinen Steuerungs-Datensatz"
 +msgstr "Archiv hat keinen Steuerungs-Datensatz"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "Kann keinen Cursor bekommen"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "W: Kann Verzeichnis %s nicht lesen\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "W: Kann nicht zugreifen auf %s\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "F: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "W: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "F: Fehler gehören zu Datei "
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "Konnte %s nicht auflösen"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "Baumabschreiten fehlgeschlagen"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "Konnte %s nicht öffnen"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr " DeLink %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "Kann kein readlink auf %s durchführen"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
 -msgstr "Konnte %s entfernen (unlink)"
 +msgstr "Konnte %s nicht entfernen (unlink)"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** Konnte keine Verknüpfung von %s zu %s anlegen"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " DeLink-Limit von %sB erreicht.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "Kann auf %s nicht zugreifen."
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "Archiv hatte kein Paket-Feld"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr "  %s hat keinen Eintrag in der Override-Liste.\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "  %s-Maintainer ist %s und nicht %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr "  %s hat keinen Eintrag in der Source-Override-Liste.\n"
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr "  %s hat keinen Eintrag in der Binary-Override-Liste.\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -567,7 -554,7 +577,7 @@@ msgstr "Interner Fehler, konnte Bestand
  
  #: ftparchive/contents.cc:353 ftparchive/contents.cc:384
  msgid "realloc - Failed to allocate memory"
 -msgstr "realloc - Speicheranforderung fehlgeschlagen"
 +msgstr "realloc – Speicheranforderung fehlgeschlagen"
  
  #: ftparchive/override.cc:38 ftparchive/override.cc:146
  #, c-format
@@@ -587,7 -574,7 +597,7 @@@ msgstr "Missgestaltetes Override %s Zei
  #: ftparchive/override.cc:92 ftparchive/override.cc:195
  #, c-format
  msgid "Malformed override %s line %lu #3"
 -msgstr "Missgestaltetes Override %s Zeile %lu #2"
 +msgstr "Missgestaltetes Override %s Zeile %lu #3"
  
  #: ftparchive/override.cc:131 ftparchive/override.cc:205
  #, c-format
@@@ -597,7 -584,7 +607,7 @@@ msgstr "Konnte die Override-Datei %s ni
  #: ftparchive/multicompress.cc:75
  #, c-format
  msgid "Unknown compression algorithm '%s'"
 -msgstr "Unbekannter Komprimierungsalgorithmus »%s«"
 +msgstr "Unbekannter Komprimierungsalgorithmus „%s“"
  
  #: ftparchive/multicompress.cc:105
  #, c-format
@@@ -655,79 -642,80 +665,79 @@@ msgstr "Problem beim Unlinking von %s
  msgid "Failed to rename %s to %s"
  msgstr "Konnte %s nicht in %s umbenennen"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "J"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
 -msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
 +msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Die folgenden Pakete haben nichterfüllte Abhängigkeiten:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "aber %s ist installiert"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "aber %s soll installiert werden"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "ist aber nicht installierbar"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "ist aber ein virtuelles Paket"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "ist aber nicht installiert"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "soll aber nicht installiert werden"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " oder "
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Die folgenden NEUEN Pakete werden installiert:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Die folgenden Pakete werden ENTFERNT:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Die folgenden Pakete sind zurückgehalten worden:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Die folgenden Pakete werden aktualisiert:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Die folgenden Pakete werden DEAKTUALISIERT:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Die folgenden gehaltenen Pakete werden verändert:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (wegen %s) "
  
--#: cmdline/apt-get.cc:546
 -#, fuzzy
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -735,226 -723,228 +745,226 @@@ msgstr "
  "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n"
  "Dies sollte NICHT geschehen, wenn Sie nicht genau wissen, was Sie tun!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu aktualisiert, %lu neu installiert, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu erneut installiert, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu deaktualisiert, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu nicht vollständig installiert oder entfernt.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Abhängigkeit werden korrigiert..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " fehlgeschlagen."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Kann Abhängigkeiten nicht korrigieren"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Kann die Menge zu erneuernder Pakete nicht minimieren"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Fertig"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
 -msgstr ""
 -"Sie möchten wahrscheinlich »apt-get -f install« aufrufen, um dies zu "
 -"korrigieren."
 +msgstr "Probieren Sie „apt-get -f install“, um diese zu korrigieren."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Nichterfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
 -msgstr ""
 +msgstr "Authentifizierungswarnung überstimmt.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Diese Pakete ohne Überprüfung installieren [j/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Einige Pakete konnten nicht authentifiziert werden"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "Interner Fehler, InstallPackages mit kaputten Pakete aufgerufen!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Interner Fehler, Anordnung beendete nicht"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Kann kein Lock für das Downloadverzeichnis erhalten."
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Die Liste der Quellen konnte nicht gelesen werden."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  "Wie merkwürdig... Die Größen haben nicht übereingestimmt, schreiben Sie an "
  "apt@packages.debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Es müssen noch %sB von %sB Archiven geholt werden.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Es müssen %sB Archive geholt werden.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "Nach dem Auspacken werden %sB Plattenplatz zusätzlich benutzt.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben worden sein.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Konnte freien Platz in %s nicht bestimmen"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Sie haben nicht genug Platz in %s."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
 -msgstr "»Nur triviale« angegeben, aber das ist keine triviale Operation."
 +msgstr "„Nur triviale“ angegeben, aber das ist keine triviale Operation."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Ja, tu was ich sage!"
  
--#: cmdline/apt-get.cc:868
 -#, fuzzy, c-format
++#: cmdline/apt-get.cc:883
 +#, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
  "To continue type in the phrase '%s'\n"
  " ?] "
  msgstr ""
  "Sie sind im Begriff, etwas potenziell Schädliches zu tun.\n"
 -"Zum Fortfahren geben Sie bitte »%s« ein.\n"
 +"Zum Fortfahren geben Sie bitte „%s“ ein.\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Abbruch."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Möchten Sie fortfahren [J/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Konnte %s nicht holen  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Einige Dateien konnten nicht heruntergeladen werden"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
  msgstr ""
 -"Konnte einige Archive nicht herunterladen, vielleicht »apt-get update« oder "
 -"mit »--fix-missing« probieren?"
 +"Konnte einige Archive nicht herunterladen, vielleicht „apt-get update“ oder "
 +"mit „--fix-missing“ probieren?"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing und Wechselmedien werden zurzeit nicht unterstützt"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Konnte fehlende Pakete nicht korrigieren."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Installation abgebrochen."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Achtung, wähle %s an Stelle von %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
 -"Überspringe %s, es ist schon installiert und »upgrade« ist nicht gesetzt.\n"
 +"Überspringe %s, es ist schon installiert und „upgrade“ ist nicht gesetzt.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
 -msgstr "Pakete %s ist ein virtuelles Pakete, das bereitgestellt wird von:\n"
 +msgstr "Paket %s ist ein virtuelles Paket, das bereitgestellt wird von:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Installiert]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Sie sollten eines explizit zum Installieren auswählen."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -965,51 -955,51 +975,51 @@@ msgstr "
  "Paket referenziert. Das kann heißen, dass das Paket fehlt, dass es veraltet\n"
  "ist oder nur aus einer anderen Quelle verfügbar ist.\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Doch die folgenden Pakete ersetzen es:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Paket %s hat keinen Installationskandidaten"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr ""
  "Re-Installation von %s ist nicht möglich,\n"
  "es kann nicht heruntergeladen werden.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s ist schon die neueste Version.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
 -msgstr "Release »%s« für »%s« konnte nicht gefunden werden"
 +msgstr "Release „%s“ für „%s“ konnte nicht gefunden werden"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
 -msgstr "Version »%s« für »%s« konnte nicht gefunden werden"
 +msgstr "Version „%s“ für „%s“ konnte nicht gefunden werden"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Gewählte Version %s (%s) für %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
 -msgstr "Der Befehl »update« nimmt keine Argumente"
 +msgstr "Der Befehl „update“ nimmt keine Argumente"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Kann kein Lock auf das Listenverzeichnis bekommen"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1017,33 -1007,35 +1027,53 @@@ msgstr "
  "Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden "
  "ignoriert oder alte an ihrer Stelle benutzt."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr ""
++"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Konnte Paket %s nicht finden"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
 -msgstr "Achtung, wähle %s für reg. Ausdruck »%s«\n"
 +msgstr "Achtung, wähle %s für reg. Ausdruck „%s“\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
 -msgstr ""
 -"Sie möchten wahrscheinlich »apt-get -f install« aufrufen, um dies zu "
 -"korrigieren:"
 +msgstr "Probieren Sie „apt-get -f install“, um diese zu korrigieren:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
  msgstr ""
 -"Nichterfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne "
 +"Nichterfüllte Abhängigkeiten. Versuchen Sie „apt-get -f install“ ohne "
  "jeglich Pakete (oder geben Sie eine Lösung an)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1052,138 -1044,138 +1082,133 @@@
  msgstr ""
  "Einige Pakete konnten nicht installiert werden. Das kann bedeuten, dass\n"
  "Sie eine unmögliche Situation angefordert haben oder dass, wenn Sie die\n"
 -"instabile Distribution verwenden, einige erforderliche Pakete noch nicht\n"
 +"Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n"
  "kreiert oder aus Incoming herausbewegt wurden."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
  "that package should be filed."
  msgstr ""
 -"Da Sie nur eine einzige Operation angefordert haben ist es sehr "
 +"Da Sie nur eine einzige Operation angefordert haben, ist es sehr "
  "wahrscheinlich,\n"
  "dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n"
  "dieses Paket erfolgen sollte."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr ""
--"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Kaputte Pakete"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Vorgeschlagene Pakete:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Empfohlene Pakete:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Berechne Upgrade..."
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Fehlgeschlagen"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Fertig"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
 -"Es muss mindesten ein Paket angegeben werden, dessen Quellen geholt werden "
 +"Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
  "sollen"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Kann Quellpaket für %s nicht finden"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
 -#, fuzzy, c-format
++#: cmdline/apt-get.cc:2043
 +#, c-format
  msgid "Skipping already downloaded file '%s'\n"
 -msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n"
 +msgstr "Überspringe schon heruntergeladene Datei „%s“\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Sie haben nicht genug freien Platz in %s"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Es müssen noch %sB/%sB der Quellarchive geholt werden.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Es müssen %sB der Quellarchive geholt werden.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Hole Quelle %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Konnte einige Archive nicht holen."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
 -msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n"
 +msgstr "Entpack-Befehl „%s“ fehlgeschlagen.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
 -msgstr ""
 +msgstr "Überprüfen Sie, ob das Paket „dpkg-dev“ installiert ist.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
 -msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
 +msgstr "Build-Befehl „%s“ fehlgeschlagen.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Kindprozess fehlgeschlagen"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "Es muss zumindest ein Paket angegeben werden, dessen Build-Dependencies\n"
  "überprüft werden sollen."
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Information zu Build-Dependencies für %s konnte nicht gefunden werden."
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s hat keine Build-Dependencies.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1192,7 -1184,7 +1217,7 @@@ msgstr "
  "%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht "
  "gefunden werden kann."
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1201,32 -1193,32 +1226,32 @@@ msgstr "
  "%s Abhängigkeit für %s kann nicht befriedigt werden, da keine verfügbare "
  "Version von Paket %s die Versionsanforderungen erfüllen kann."
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Konnte die %s-Abhängigkeit für %s nicht erfüllen: Installiertes Paket %s ist "
  "zu neu."
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Konnte die %s-Abhängigkeit für %s nicht erfüllen: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
 -msgstr "Build-Abhängigkeit für %s konnte nicht erfüllt werden."
 +msgstr "Build-Abhängigkeiten für %s konnten nicht erfüllt werden."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
 -msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen"
 +msgstr "Verarbeitung der Build-Abhängigkeiten fehlgeschlagen"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Unterstützte Module:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1276,36 -1268,35 +1301,36 @@@ msgstr "
  "sind update und install.\n"
  "\n"
  "Befehle:\n"
 -"   update       - neue Liste von Paketen einlesen\n"
 -"   upgrade      - ein Upgrade durchführen\n"
 -"   install      - neue Pakete installieren (pkg ist libc6 und nicht libc6."
 +"   update       – neue Liste von Paketen einlesen\n"
 +"   upgrade      – eine Paketaktualisierung durchführen\n"
 +"   install      – neue Pakete installieren (pkg ist libc6 und nicht libc6."
  "deb)\n"
 -"   remove       - Pakete entfernen\n"
 -"   source       - Quellarchive herunterladen\n"
 -"   build-dep    - die »Build-Dependencies« für Quellpakete konfigurieren\n"
 -"   dist-upgrade - »Distribution upgrade«, siehe apt-get(8)\n"
 -"   dselect-upgrade - der Auswahl aus »dselect« folgen\n"
 -"   clean        - heruntergeladene Archive löschen\n"
 -"   autoclean    - veraltete heruntergeladene Archive löschen\n"
 -"   check        - überprüfen, dass es keine nicht erfüllten Abhängigkeiten "
 +"   remove       – Pakete entfernen\n"
 +"   source       – Quellarchive herunterladen\n"
 +"   build-dep    – die Build-Abhängigkeiten für Quellpakete konfigurieren\n"
 +"   dist-upgrade – „Distribution upgrade“, siehe apt-get(8)\n"
 +"   dselect-upgrade – der Auswahl aus „dselect“ folgen\n"
 +"   clean        – heruntergeladene Archive löschen\n"
 +"   autoclean    – veraltete heruntergeladene Archive löschen\n"
 +"   check        – überprüfen, dass es keine nicht erfüllten Abhängigkeiten "
  "gibt\n"
  "\n"
  "Optionen:\n"
  "  -h   dieser Hilfetext\n"
 -"  -q   protokollierbare (logbare) Ausgabe - kein Fortschrittsindikator\n"
 +"  -q   protokollierbare (logbare) Ausgabe – keine Fortschrittsanzeige\n"
  "  -qq  keine Ausgabe außer bei Fehlern\n"
 -"  -d   nur herunterladen - Archive NICHT installieren oder entpacken\n"
 +"  -d   nur herunterladen – Archive NICHT installieren oder entpacken\n"
  "  -s   nichts tun; nur eine Simulation der Vorgänge durchführen\n"
 -"  -y   für alle Antworten »Ja« annehmen und nicht nachfragen\n"
 -"  -f   versuchen fortzufahren, wenn dir Integritätsüberprüfung fehlschlägt\n"
 +"  -y   für alle Antworten „Ja“ annehmen und nicht nachfragen\n"
 +"  -f   versuchen fortzufahren, wenn die Integritätsüberprüfung fehlschlägt\n"
  "  -m   versuchen fortzufahren, wenn Archive nicht auffindbar sind\n"
  "  -u   auch eine Liste der aktualisierten Pakete mit anzeigen\n"
  "  -b   ein Quellpaket nach dem Herunterladen übersetzen\n"
  "  -V   ausführliche Versionsnummern anzeigen\n"
  "  -c=? Diese Konfigurationsdatei benutzen\n"
  "  -o=? Beliebige Konfigurationsoptionen setzen, z. B. -o dir::cache=/tmp\n"
 -"Siehe auch die Man-Seiten apt-get(8), sources.list(5) und apt.conf(5) für\n"
 +"Siehe auch die Handbuch-Seiten apt-get(8), sources.list(5) und apt.conf(5) "
 +"für\n"
  "weitergehende Informationen und Optionen.\n"
  "                       Dieses APT hat Super-Kuh-Kräfte.\n"
  
@@@ -1342,13 -1333,13 +1367,13 @@@ msgid "
  " '%s'\n"
  "in the drive '%s' and press enter\n"
  msgstr ""
 -"Medienwechsel: Bitte legen Sie Medium mit den Name\n"
 -" »%s«\n"
 -"in Laufwerk »%s« und drücken Sie die Eingabetaste.\n"
 +"Medienwechsel: Bitte legen Sie das Medium mit dem Namen\n"
 +" „%s“\n"
 +"in Laufwerk „%s“ und drücken Sie die Eingabetaste.\n"
  
  #: cmdline/apt-sortpkgs.cc:86
  msgid "Unknown package record!"
 -msgstr "Unbekannter Paketeintrag"
 +msgstr "Unbekannter Paketeintrag!"
  
  #: cmdline/apt-sortpkgs.cc:150
  msgid ""
@@@ -1415,19 -1406,19 +1440,19 @@@ msgstr "Führe Information zur Verfügb
  msgid "Failed to create pipes"
  msgstr "Konnte Weiterleitungen nicht erzeugen"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "Konnte gzip nicht ausführen"
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Korrumpiertes Archiv"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv korrumpiert"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Unbekannter Tar-Kopf-Typ %u, Bestandteil %s"
@@@ -1442,7 -1433,7 +1467,7 @@@ msgstr "Fehler beim Lesen der Archivdat
  
  #: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
  msgid "Invalid archive member header"
 -msgstr "Ungültige Archivdateienkopfzeile"
 +msgstr "Ungültige Archivdateikopfzeile"
  
  #: apt-inst/contrib/arfile.cc:131
  msgid "Archive is too short"
@@@ -1450,11 -1441,11 +1475,11 @@@ msgstr "Archiv ist zu kurz
  
  #: apt-inst/contrib/arfile.cc:135
  msgid "Failed to read the archive headers"
 -msgstr "Konnte Archiveköpfe nicht lesen."
 +msgstr "Konnte Archivköpfe nicht lesen."
  
  #: apt-inst/filelist.cc:384
  msgid "DropNode called on still linked node"
 -msgstr "»DropNode« auf noch verlinktem Knoten aufgerufen"
 +msgstr "„DropNode“ auf noch verlinktem Knoten aufgerufen"
  
  #: apt-inst/filelist.cc:416
  msgid "Failed to locate the hash element!"
@@@ -1466,7 -1457,7 +1491,7 @@@ msgstr "Konnte Umleitung nicht reservie
  
  #: apt-inst/filelist.cc:468
  msgid "Internal error in AddDiversion"
 -msgstr "Interner Fehler in »AddDiversion«"
 +msgstr "Interner Fehler in „AddDiversion“"
  
  #: apt-inst/filelist.cc:481
  #, c-format
@@@ -1484,9 -1475,9 +1509,9 @@@ msgid "Duplicate conf file %s/%s
  msgstr "Doppelte Konfigurationsdatei %s/%s"
  
  #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
 -#, fuzzy, c-format
 +#, c-format
  msgid "Failed to write file %s"
 -msgstr "Konnte nicht in Datei %s schreiben"
 +msgstr "Konnte Datei %s nicht schreiben"
  
  #: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
  #, c-format
@@@ -1570,12 -1561,12 +1595,12 @@@ msgstr "Kann nicht auf %sinfo zugreifen
  #: apt-inst/deb/dpkgdb.cc:123
  msgid "The info and temp directories need to be on the same filesystem"
  msgstr ""
 -"Die »info«- und »temp«-Verzeichnisse müssen im selben Dateisystem liegen"
 +"Die „info“- und „temp“-Verzeichnisse müssen im selben Dateisystem liegen"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Paketlisten werden gelesen"
  
@@@ -1589,6 -1580,7 +1614,6 @@@ msgstr "Kann nicht ins Administrationsv
  msgid "Internal error getting a package name"
  msgstr "Interner Fehler beim Holen des Paket-Namens"
  
 -# 
  #: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
  msgid "Reading file listing"
  msgstr "Paketlisten werden gelesen"
@@@ -1600,14 -1592,14 +1625,14 @@@ msgid "
  "then make it empty and immediately re-install the same version of the "
  "package!"
  msgstr ""
 -"Fehler beim Öffnen der Listendatei »%sinfo/%s«. Wenn Sie diese Datei nicht "
 +"Fehler beim Öffnen der Listendatei „%sinfo/%s“. Wenn Sie diese Datei nicht "
  "wiederherstellen können, dann leeren Sie sie und installieren Sie sofort "
  "dieselbe Version des Paketes erneut!"
  
  #: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
  #, c-format
  msgid "Failed reading the list file %sinfo/%s"
 -msgstr "Fehler beim Lesen der Listendatei »%sinfo/%s«."
 +msgstr "Fehler beim Lesen der Listendatei „%sinfo/%s“."
  
  #: apt-inst/deb/dpkgdb.cc:266
  msgid "Internal error getting a node"
@@@ -1639,12 -1631,12 +1664,12 @@@ msgstr "Der Paketcache muss erst initia
  #: apt-inst/deb/dpkgdb.cc:443
  #, c-format
  msgid "Failed to find a Package: header, offset %lu"
 -msgstr "Konnte keine »Package:«-Kopfzeile finden, Abstand %lu"
 +msgstr "Konnte keine „Package:“-Kopfzeile finden, Abstand %lu"
  
  #: apt-inst/deb/dpkgdb.cc:465
  #, c-format
  msgid "Bad ConfFile section in the status file. Offset %lu"
 -msgstr "Fehlerhafter »ConfFile«-Abschnitt in der Statusdatei, Abstand %lu"
 +msgstr "Fehlerhafter „ConfFile“-Abschnitt in der Statusdatei, Abstand %lu"
  
  #: apt-inst/deb/dpkgdb.cc:470
  #, c-format
@@@ -1654,12 -1646,12 +1679,12 @@@ msgstr "Fehler beim Parsen der MD5-Summ
  #: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
  #, c-format
  msgid "This is not a valid DEB archive, missing '%s' member"
 -msgstr "Dies ist kein gültiges DEB-Archiv, da es »%s« nicht enthält"
 +msgstr "Dies ist kein gültiges DEB-Archiv, da es „%s“ nicht enthält"
  
  #: apt-inst/deb/debfile.cc:52
  #, c-format
  msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
 -msgstr "Dies ist kein gültiges DEB-Archiv, da es weder »%s« noch »%s« enthält"
 +msgstr "Dies ist kein gültiges DEB-Archiv, da es weder „%s“ noch „%s“ enthält"
  
  #: apt-inst/deb/debfile.cc:112
  #, c-format
@@@ -1688,7 -1680,7 +1713,7 @@@ msgid "
  "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
  "cannot be used to add new CD-ROMs"
  msgstr ""
 -"Bitte verwenden Sie apt-cdrom, um diese CD von APT erkennbar zu machen - apt-"
 +"Bitte verwenden Sie apt-cdrom, um diese CD von APT erkennbar zu machen. apt-"
  "get update kann nicht dazu verwendet werden, neue CDs hinzuzufügen"
  
  #: methods/cdrom.cc:131
@@@ -1703,20 -1695,21 +1728,22 @@@ msgstr "
  "verwendet."
  
  #: methods/cdrom.cc:169
 -#, fuzzy
  msgid "Disk not found."
 -msgstr "Datei nicht gefunden"
 +msgstr "Disk nicht gefunden."
  
  #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
  msgid "File not found"
  msgstr "Datei nicht gefunden"
  
 -# looks like someone hardcoded English grammar
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
 +# looks like someone hardcoded English grammar
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Kann nicht zugreifen."
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Kann Änderungszeitpunkt nicht setzen"
  
@@@ -1757,13 -1750,13 +1784,13 @@@ msgid "
  "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
  "is empty."
  msgstr ""
 -"Es war ein Proxy-Server angegeben, aber kein Einlogg-Skript - Acquire::ftp::"
 +"Es war ein Proxy-Server angegeben, aber kein Einlogg-Skript, Acquire::ftp::"
  "ProxyLogin ist leer."
  
  #: methods/ftp.cc:265
  #, c-format
  msgid "Login script command '%s' failed, server said: %s"
 -msgstr "Befehl »%s« des Einlogg-Skriptes ist fehlgeschlagen: %s"
 +msgstr "Befehl „%s“ des Einlogg-Skriptes ist fehlgeschlagen: %s"
  
  #: methods/ftp.cc:291
  #, c-format
@@@ -1845,14 -1838,14 +1872,14 @@@ msgstr "Datenverbindungsaufbau erlitt Z
  msgid "Unable to accept connection"
  msgstr "Kann Verbindung nicht annehmen"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf"
  
  #: methods/ftp.cc:877
  #, c-format
  msgid "Unable to fetch file, server said '%s'"
 -msgstr "Kann Datei nicht holen, Server antwortete »%s«"
 +msgstr "Kann Datei nicht holen, Server antwortete „%s“"
  
  #: methods/ftp.cc:892 methods/rsh.cc:322
  msgid "Data socket timed out"
@@@ -1861,7 -1854,7 +1888,7 @@@ msgstr "Datenverbindung erlitt Zeitübe
  #: methods/ftp.cc:922
  #, c-format
  msgid "Data transfer failed, server said '%s'"
 -msgstr "Datenübertragung fehlgeschlagen, Server antwortete »%s«"
 +msgstr "Datenübertragung fehlgeschlagen, Server antwortete „%s“"
  
  #. Get the files information
  #: methods/ftp.cc:997
@@@ -1913,149 -1906,143 +1940,149 @@@ msgstr "Verbinde mit %s
  #: methods/connect.cc:167
  #, c-format
  msgid "Could not resolve '%s'"
 -msgstr "Konnte »%s« nicht auflösen"
 +msgstr "Konnte „%s“ nicht auflösen"
  
  #: methods/connect.cc:173
  #, c-format
  msgid "Temporary failure resolving '%s'"
 -msgstr "Temporärer Fehlschlag beim Auflösen von »%s«"
 +msgstr "Temporärer Fehlschlag beim Auflösen von „%s“"
  
  #: methods/connect.cc:176
  #, c-format
  msgid "Something wicked happened resolving '%s:%s' (%i)"
 -msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i)"
 +msgstr "Beim Auflösen von „%s:%s“ ist etwas Schlimmes passiert (%i)"
  
  #: methods/connect.cc:223
  #, c-format
  msgid "Unable to connect to %s %s:"
  msgstr "Kann nicht mit %s:%s verbinden:"
  
 -#: methods/gpgv.cc:64
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:65
 +#, c-format
  msgid "Couldn't access keyring: '%s'"
 -msgstr "Konnte »%s« nicht auflösen"
 +msgstr "Konnte nicht auf Schlüsselring zugreifen: „%s“"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 -msgstr ""
 +msgstr "E: Argumentliste von Acquire::gpgv::Options zu lang. Breche ab."
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
 +"Interner Fehler: Gültige Signatur, aber konnte den Fingerabdruck des "
 +"Schlüssels nicht ermitteln?!"
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
 -msgstr ""
 +msgstr "Mindestens eine ungültige Signatur wurde entdeckt."
  
 -#: methods/gpgv.cc:207
 +#: methods/gpgv.cc:213
  #, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
  msgstr ""
 +"Konnte „%s“ zum Überprüfen der Signatur nicht ausführen (ist gnupg "
 +"installiert?)"
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
 -msgstr ""
 +msgstr "Unbekannter Fehler beim Ausführen von gpgv"
  
 -#: methods/gpgv.cc:243
 -#, fuzzy
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
 -msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
 +msgstr "Die folgenden Signaturen waren ungültig:\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
  msgstr ""
 +"Die folgenden Signaturen konnten nicht überprüft werden, weil ihr "
 +"öffentlicher\n"
 +"Schlüssel nicht verfügbar ist:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Konnte keine Pipe für %s öffnen"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Lesefehler von Prozess %s"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Warte auf Kopfzeilen (header)"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Schlechte Kopfzeile"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "Der http-Server sandte eine ungültige Antwort-Kopfzeile"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
 -msgstr "Der http-Server sandte eine ungültige »Content-Length«-Kopfzeile"
 +msgstr "Der http-Server sandte eine ungültige „Content-Length“-Kopfzeile"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
 -msgstr "Der http-Server sandte eine ungültige »Content-Range«-Kopfzeile"
 +msgstr "Der http-Server sandte eine ungültige „Content-Range“-Kopfzeile"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft."
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Unbekanntes Datumsformat"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Auswahl fehlgeschlagen"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Verbindung erlitt Zeitüberschreitung"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Fehler beim Schreiben einer Ausgabedatei"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Fehler beim Schreiben einer Datei"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Fehler beim Schreiben der Datei"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr ""
  "Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung "
  "geschlossen"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Fehler beim Lesen vom Server"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Fehlerhafte Kopfzeilendaten"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Verbindung fehlgeschlagen"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Interner Fehler"
  
@@@ -2068,7 -2055,7 +2095,7 @@@ msgstr "Kann eine leere Datei nicht mi
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Konnte kein mmap von %lu Bytes durchführen"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Auswahl %s nicht gefunden"
@@@ -2076,7 -2063,7 +2103,7 @@@
  #: apt-pkg/contrib/configuration.cc:436
  #, c-format
  msgid "Unrecognized type abbreviation: '%c'"
 -msgstr "Nicht erkannte Typabkürzung: »%c«"
 +msgstr "Nicht erkannte Typabkürzung: „%c“"
  
  #: apt-pkg/contrib/configuration.cc:494
  #, c-format
@@@ -2122,19 -2109,19 +2149,19 @@@ msgstr "Syntaxfehler %s:%u: Einbindung 
  #: apt-pkg/contrib/configuration.cc:704
  #, c-format
  msgid "Syntax error %s:%u: Unsupported directive '%s'"
 -msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive »%s«"
 +msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive „%s“"
  
  #: apt-pkg/contrib/configuration.cc:738
  #, c-format
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll am Dateiende"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Fehler!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Fertig"
@@@ -2142,7 -2129,7 +2169,7 @@@
  #: apt-pkg/contrib/cmndline.cc:80
  #, c-format
  msgid "Command line option '%c' [from %s] is not known."
 -msgstr "Kommandozeilenoption »%c« [aus %s] ist nicht bekannt."
 +msgstr "Kommandozeilenoption „%c“ [aus %s] ist nicht bekannt."
  
  #: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
  #: apt-pkg/contrib/cmndline.cc:122
@@@ -2168,18 -2155,17 +2195,18 @@@ msgstr "Option %s: Konfigurationswertsp
  #: apt-pkg/contrib/cmndline.cc:237
  #, c-format
  msgid "Option %s requires an integer argument, not '%s'"
 -msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht »%s«"
 +msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht „%s“"
  
  #: apt-pkg/contrib/cmndline.cc:268
  #, c-format
  msgid "Option '%s' is too long"
 -msgstr "Option »%s« ist zu lang"
 +msgstr "Option „%s“ ist zu lang"
  
 +# Check for boolean; -1 is unspecified, 0 is yes 1 is no
  #: apt-pkg/contrib/cmndline.cc:301
  #, c-format
  msgid "Sense %s is not understood, try true or false."
 -msgstr "Sense %s wird nicht verstanden, versuchen Sie »true« oder »false«."
 +msgstr "Der Sinn von „%s“ ist nicht klar, versuchen Sie „true“ oder „false“."
  
  #: apt-pkg/contrib/cmndline.cc:351
  #, c-format
@@@ -2261,99 -2247,99 +2288,116 @@@ msgstr "Beim Schließen der Datei trat 
  
  #: apt-pkg/contrib/fileutl.cc:603
  msgid "Problem unlinking the file"
 -msgstr "Beim Unlinking Datei trat ein Problem auf"
 +msgstr "Beim Unlinking der Datei trat ein Problem auf"
  
  #: apt-pkg/contrib/fileutl.cc:614
  msgid "Problem syncing the file"
  msgstr "Beim Synchronisieren einer Datei trat ein Problem auf"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Leerer Paketcache"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Die Paketcachedatei ist korrumpiert"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
 -msgstr "Die Paketcachedatei ist in einer inkompatiblen Version"
 +msgstr "Die Paketcachedatei liegt in einer inkompatiblen Version vor"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
 -msgstr "Dieses APT unterstützt das Versionssystem »%s« nicht"
 +msgstr "Dieses APT unterstützt das Versionssystem „%s“ nicht"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "Der Paketcache wurde für eine andere Architektur aufgebaut"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Hängt ab"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Hängt ab (vorher)"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Schlägt vor"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Empfiehlt"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Kollidiert"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Ersetzt"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Veraltet"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "wichtig"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "erforderlich"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "standard"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "optional"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Abhängigkeitsbaum wird aufgebaut"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Mögliche Versionen"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Abhängigkeits-Generierung"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Führe Information zur Verfügbarkeit zusammen"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Konnte %s nicht öffnen"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Konnte Datei %s nicht schreiben"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Kann Paketdatei %s nicht parsen (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Kann Paketdatei %s nicht parsen (2)"
@@@ -2361,34 -2347,34 +2405,34 @@@
  #: apt-pkg/sourcelist.cc:94
  #, c-format
  msgid "Malformed line %lu in source list %s (URI)"
 -msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)"
 +msgstr "Missgestaltete Zeile %lu in Quellliste %s („URI“)"
  
  #: apt-pkg/sourcelist.cc:96
  #, c-format
  msgid "Malformed line %lu in source list %s (dist)"
 -msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)"
 +msgstr "Missgestaltete Zeile %lu in Quellliste %s („dist“)"
  
  #: apt-pkg/sourcelist.cc:99
  #, c-format
  msgid "Malformed line %lu in source list %s (URI parse)"
 -msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
 +msgstr "Missgestaltete Zeile %lu in Quellliste %s („URI parse“)"
  
  #: apt-pkg/sourcelist.cc:105
  #, c-format
  msgid "Malformed line %lu in source list %s (absolute dist)"
 -msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)"
 +msgstr "Missgestaltete Zeile %lu in Quellliste %s („absolute dist“)"
  
  #: apt-pkg/sourcelist.cc:112
  #, c-format
  msgid "Malformed line %lu in source list %s (dist parse)"
 -msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)"
 +msgstr "Missgestaltete Zeile %lu in Quellliste %s („dist parse“)"
  
  #: apt-pkg/sourcelist.cc:203
  #, c-format
  msgid "Opening %s"
  msgstr "%s wird geöffnet"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Zeile %u zu lang in der Quellliste %s."
@@@ -2396,17 -2382,17 +2440,17 @@@
  #: apt-pkg/sourcelist.cc:240
  #, c-format
  msgid "Malformed line %u in source list %s (type)"
 -msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
 +msgstr "Missgestaltete Zeile %u in Quellliste %s („type“)"
  
  #: apt-pkg/sourcelist.cc:244
 -#, fuzzy, c-format
 +#, c-format
  msgid "Type '%s' is not known on line %u in source list %s"
 -msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s"
 +msgstr "Typ „%s“ ist unbekannt in Zeile %u der Quellliste %s"
  
  #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
  #, c-format
  msgid "Malformed line %u in source list %s (vendor id)"
 -msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)"
 +msgstr "Missgestaltete Zeile %u in Quellliste %s („vendor id“)"
  
  #: apt-pkg/packagemanager.cc:402
  #, c-format
@@@ -2423,9 -2409,9 +2467,9 @@@ msgstr "
  #: apt-pkg/pkgrecords.cc:37
  #, c-format
  msgid "Index file type '%s' is not supported"
 -msgstr "Indexdateityp »%s« wird nicht unterstützt"
 +msgstr "Indexdateityp „%s“ wird nicht unterstützt"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
@@@ -2433,7 -2419,7 +2477,7 @@@ msgstr "
  "Das Paket %s muss reinstalliert werden, ich kann aber kein Archiv dafür "
  "finden."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2441,7 -2427,7 +2485,7 @@@ msgstr "
  "Fehler: pkgProblemResolver::Resolve hat Unterbrechungen hervorgerufen, dies "
  "könnte durch gehaltene Pakete hervorgerufen worden sein."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr "Kann Probleme nicht korrigieren, Sie haben gehaltene kaputte Pakete."
  
@@@ -2460,12 -2446,13 +2504,12 @@@ msgstr "Archivverzeichnis %spartial feh
  #: apt-pkg/acquire.cc:823
  #, c-format
  msgid "Retrieving file %li of %li (%s remaining)"
 -msgstr ""
 +msgstr "Hole Datei %li von %li (noch %s)"
  
 -# 
  #: apt-pkg/acquire.cc:825
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li"
 -msgstr "Paketlisten werden gelesen"
 +msgstr "Hole Datei %li von %li"
  
  #: apt-pkg/acquire-worker.cc:113
  #, c-format
@@@ -2478,18 -2465,19 +2522,18 @@@ msgid "Method %s did not start correctl
  msgstr "Methode %s hat nicht korrekt gestartet"
  
  #: apt-pkg/acquire-worker.cc:377
 -#, fuzzy, c-format
 +#, c-format
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr ""
 -"Medienwechsel: Bitte legen Sie Medium mit den Name\n"
 -" »%s«\n"
 -"in Laufwerk »%s« und drücken Sie die Eingabetaste.\n"
 +"Bitte legen Sie das Medium mit dem Namen „%s“ in Laufwerk „%s“ und drücken "
 +"Sie die Eingabetaste."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
 -msgstr "Paketierungssystem »%s« wird nicht unterstützt"
 +msgstr "Paketierungssystem „%s“ wird nicht unterstützt"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen"
  
@@@ -2501,7 -2489,7 +2545,7 @@@ msgstr "Kann nicht auf %s zugreifen.
  #: apt-pkg/srcrecords.cc:48
  msgid "You must put some 'source' URIs in your sources.list"
  msgstr ""
 -"Sie müssen einige »source«-URIs für Quellen in die sources.list-Datei "
 +"Sie müssen einige „source“-URIs für Quellen in die sources.list-Datei "
  "schreiben."
  
  #: apt-pkg/cachefile.cc:73
@@@ -2512,122 -2500,121 +2556,140 @@@ msgstr "
  
  #: apt-pkg/cachefile.cc:77
  msgid "You may want to run apt-get update to correct these problems"
 -msgstr ""
 -"Sie möchten vielleicht »apt-get update« aufrufen, um diese Probleme zu lösen"
 +msgstr "Probieren Sie „apt-get update“, um diese Probleme zu korrigieren."
  
  #: apt-pkg/policy.cc:269
  msgid "Invalid record in the preferences file, no Package header"
 -msgstr "Ungültiger Eintrag in Einstellungs-Datei, kein »Package«-Header"
 +msgstr "Ungültiger Eintrag in Einstellungs-Datei, kein „Package“-Header"
  
  #: apt-pkg/policy.cc:291
  #, c-format
  msgid "Did not understand pin type %s"
 -msgstr "Konnte Stecknadeltyp (»pin type«) %s nicht verstehen"
 +msgstr "Konnte Stecknadeltyp („pin type“) %s nicht verstehen"
  
  #: apt-pkg/policy.cc:299
  msgid "No priority (or zero) specified for pin"
  msgstr "Keine Priorität (oder Null) für Pin angegeben"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Dieser Paketcache wurde für ein inkompatibles Versionssystem aufgebaut"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  "Toll, Sie haben die Anzahl an Paketen überschritten, die APT handhaben kann."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  "Toll, Sie haben die Anzahl an Versionen überschritten, die APT handhaben "
  "kann."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr ""
++"Toll, Sie haben die Anzahl an Versionen überschritten, die APT handhaben "
++"kann."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  "Toll, Sie haben die Anzahl an Abhängigkeiten überschritten, die APT "
  "handhaben kann."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Fehler trat beim Bearbeiten von %s auf (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Fehler trat beim Bearbeiten von %s auf (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  "Paket %s %s wurde nicht gefunden beim Verarbeiten der Dateiabhängigkeiten"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Kann nicht auf die Liste %s der Quellpakete zugreifen."
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Sammle Datei-Empfehlungen ein"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "E/A-Fehler beim Sichern des Quellcaches"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "MD5-Summe stimmt nicht"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr ""
 +"Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2636,7 -2623,7 +2698,7 @@@ msgstr "
  "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie "
  "dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)."
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2645,14 -2632,14 +2707,14 @@@ msgstr "
  "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie "
  "dieses Paket von Hand korrigieren müssen."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  "Die Paketindexdateien sind korrumpiert: Kein Filename:-Feld für Paket %s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Größe stimmt nicht"
  
@@@ -2661,96 -2648,96 +2723,98 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Herstellerblock %s enthält keinen Fingerabdruck"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
  "Mounting CD-ROM\n"
  msgstr ""
  "Benutze CD-ROM-Einhängpunkt %s\n"
 -"Hänge CD ein\n"
 +"Hänge CD-ROM ein\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Identifiziere... "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Gespeicherte Kennzeichnung: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Benutze CD-ROM-Einhängpunkt %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Hänge CD-ROM aus\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Warte auf CD...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Hänge CD-ROM ein...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Suche auf CD nach Index-Dateien...\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "Fand %i Paketindexe, %i Quellenindexe und %i Signaturen\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Dies ist kein gültiger Name, versuchen Sie es erneut.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
  "'%s'\n"
  msgstr ""
 -"Diese CD heißt jetzt: \n"
 -"»%s«\n"
 +"Diese CD heißt: \n"
 +"„%s“\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Kopiere Paketlisten..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Schreibe neue Quellliste\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Quelllisteneinträge für diese CD sind:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Hänge CD-ROM aus..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Es wurden %i Datensätze geschrieben.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2758,55 -2745,327 +2822,66 @@@
  "geschrieben.\n"
  
  #: apt-pkg/deb/dpkgpm.cc:358
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing %s"
 -msgstr "%s wird geöffnet"
 +msgstr "%s wird vorbereitet"
  
  #: apt-pkg/deb/dpkgpm.cc:359
 -#, fuzzy, c-format
 +#, c-format
  msgid "Unpacking %s"
 -msgstr "%s wird geöffnet"
 +msgstr "%s wird entpackt"
  
  #: apt-pkg/deb/dpkgpm.cc:364
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing to configure %s"
 -msgstr "Öffne Konfigurationsdatei %s"
 +msgstr "Konfiguration von %s wird vorbereitet"
  
  #: apt-pkg/deb/dpkgpm.cc:365
 -#, fuzzy, c-format
 +#, c-format
  msgid "Configuring %s"
 -msgstr "Verbinde mit %s"
 +msgstr "Konfiguriere %s"
  
  #: apt-pkg/deb/dpkgpm.cc:366
 -#, fuzzy, c-format
 +#, c-format
  msgid "Installed %s"
 -msgstr "  Installiert:"
 +msgstr "%s installiert"
  
  #: apt-pkg/deb/dpkgpm.cc:371
  #, c-format
  msgid "Preparing for removal of %s"
 -msgstr ""
 +msgstr "Entfernen von %s wird vorbereitet"
  
  #: apt-pkg/deb/dpkgpm.cc:372
 -#, fuzzy, c-format
 +#, c-format
  msgid "Removing %s"
 -msgstr "%s wird geöffnet"
 +msgstr "%s wird entfernt"
  
  #: apt-pkg/deb/dpkgpm.cc:373
 -#, fuzzy, c-format
 +#, c-format
  msgid "Removed %s"
 -msgstr "Empfiehlt"
 +msgstr "%s entfernt"
  
  #: apt-pkg/deb/dpkgpm.cc:378
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing to completely remove %s"
 -msgstr "Öffne Konfigurationsdatei %s"
 +msgstr "Komplettes Entfernen von %s wird vorbereitet"
  
  #: apt-pkg/deb/dpkgpm.cc:379
 -#, fuzzy, c-format
 +#, c-format
  msgid "Completely removed %s"
 -msgstr "Konnte %s nicht entfernen"
 -
 -#: methods/rsh.cc:330
 -msgid "Connection closed prematurely"
 -msgstr "Verbindung zu früh beendet"
 -
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
 -msgstr ""
 -
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr "  %s hat keinen Eintrag in der Override-Liste.\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr "  %s hat keinen Eintrag in der Override-Liste.\n"
 +msgstr "%s komplett entfernt"
  
+ #: methods/rred.cc:219
+ #, fuzzy
+ msgid "Could not patch file"
+ msgstr "Konnte Datei %s nicht öffnen"
+ 
 -#~ msgid "Reading file list"
 -#~ msgstr "Paketlisten werden gelesen"
 +#: methods/rsh.cc:330
 +msgid "Connection closed prematurely"
 +msgstr "Verbindung zu früh beendet"
+ 
++#: apt-pkg/acquire-item.cc:1097
+ #, fuzzy
 -#~ msgid "Could not execute "
 -#~ msgstr "Konnte Lock %s nicht bekommen"
 -
 -#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 -#~ msgstr "Unbekannte Herstellerkennung »%s« in Zeile %u der Quellliste %s"
 -
 -#~ msgid ""
 -#~ "Some broken packages were found while trying to process build-"
 -#~ "dependencies.\n"
 -#~ "You might want to run `apt-get -f install' to correct these."
 -#~ msgstr ""
 -#~ "Einige kaputte Pakete wurden gefunden, während die Build-Dependencies "
 -#~ "ver-\n"
 -#~ "arbeitet wurden. Sie möchten wahrscheinlich »apt-get -f install« "
 -#~ "aufrufen,\n"
 -#~ "um die Probleme zu beheben."
 -
 -#~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs."
 -#~ msgstr ""
 -#~ "Tut mir leid, Sie haben nicht genug freien Speicher in %s, um alle .debs "
 -#~ "zu halten."
 -
 -#~ msgid "<- '"
 -#~ msgstr "<- »"
 -
 -#~ msgid "'"
 -#~ msgstr "«"
 -
 -#~ msgid "-> '"
 -#~ msgstr "-> »"
 -
 -#~ msgid "Followed conf file from "
 -#~ msgstr "Folge Konfigurationsdatei von "
 -
 -#~ msgid " to "
 -#~ msgstr " nach "
 -
 -# 
 -#~ msgid "Extract "
 -#~ msgstr "Extrahiert "
 -
 -#~ msgid "Aborted, backing out"
 -#~ msgstr "Abgebrochen, nehme Änderungen zurück"
 -
 -#~ msgid "De-replaced "
 -#~ msgstr "Zurück-ersetzt "
 -
 -#~ msgid " from "
 -#~ msgstr " von "
 -
 -#~ msgid "Backing out "
 -#~ msgstr "Nehme Änderung zurück "
 -
 -#~ msgid " [new node]"
 -#~ msgstr " [neuer Knoten]"
 -
 -#~ msgid "Replaced file "
 -#~ msgstr "Ersetzte Datei "
 -
 -#~ msgid "Internal error, Unable to parse a package record"
 -#~ msgstr "Interner Fehler, konnte Paket-Daten nicht parsen"
 -
 -#~ msgid "Unimplemented"
 -#~ msgstr "Nicht implementiert"
 -
 -#~ msgid "You must give at least one file name"
 -#~ msgstr "Sie müssen zumindest einen Dateinamen angeben"
 -
 -#~ msgid "Generating cache"
 -#~ msgstr "Erzeuge Cache"
 -
 -#~ msgid "Problem with SelectFile"
 -#~ msgstr "Problem mit »SelectFile«"
 -
 -#~ msgid "Problem with MergeList"
 -#~ msgstr "Problem mit »MergeList«"
 -
 -#~ msgid "Regex compilation error"
 -#~ msgstr "Fehler beim Kompilieren eines regulären Ausdrucks"
 -
 -#~ msgid "Write to stdout failed"
 -#~ msgstr "Schreiben auf die Standardausgabe fehlgeschlagen"
 -
 -#~ msgid "Generate must be enabled for this function"
 -#~ msgstr "Generieren muss erlaubt sein für diese Funktion"
 -
 -#~ msgid "Failed to stat %s%s"
 -#~ msgstr "Konnte nicht auf %s%s zugreifen"
 -
 -#~ msgid "Failed to open %s.new"
 -#~ msgstr "Konnte %s.new nicht öffnen"
 -
 -#~ msgid "Failed to rename %s.new to %s"
 -#~ msgstr "Konnte %s.new nicht in %s umbenennen"
 -
 -#~ msgid "I found (binary):"
 -#~ msgstr "Habe gefunden (binär):"
 -
 -#~ msgid "I found (source):"
 -#~ msgstr "Habe gefunden (Quellen):"
 -
 -#~ msgid "Found "
 -#~ msgstr "Habe "
 -
 -#~ msgid " source indexes."
 -#~ msgstr " Quell-Indizes gefunden."
 -
 -#~ msgid ""
 -#~ "Unable to locate any package files, perhaps this is not a Debian Disc"
 -#~ msgstr ""
 -#~ "Konnte keine Paket-Dateien finden - vielleicht ist dies keine Debian-CD"
 -
 -#~ msgid " '"
 -#~ msgstr " »"
 -
 -#~ msgid ""
 -#~ "Usage: apt-cdrom [options] command\n"
 -#~ "\n"
 -#~ "apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
 -#~ "CDROM mount point and device information is taken from apt.conf\n"
 -#~ "and /etc/fstab.\n"
 -#~ "\n"
 -#~ "Commands:\n"
 -#~ "   add - Add a CDROM\n"
 -#~ "   ident - Report the identity of a CDROM\n"
 -#~ "\n"
 -#~ "Options:\n"
 -#~ "  -h   This help text\n"
 -#~ "  -d   CD-ROM mount point\n"
 -#~ "  -r   Rename a recognized CD-ROM\n"
 -#~ "  -m   No mounting\n"
 -#~ "  -f   Fast mode, don't check package files\n"
 -#~ "  -a   Thorough scan mode\n"
 -#~ "  -c=? Read this configuration file\n"
 -#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 -#~ "See fstab(5)\n"
 -#~ msgstr ""
 -#~ "Aufruf: apt-cdrom [optionen] befehl\n"
 -#~ "\n"
 -#~ "apt-cdrom ist ein Werkzeug, um CD-ROMs zu APTs Quellliste hinzuzufügen. "
 -#~ "Der\n"
 -#~ "Einhängepunkt der CD-ROM und die Geräteinformationen werden aus apt.conf "
 -#~ "und\n"
 -#~ "/etc/fstab ermittelt.\n"
 -#~ "\n"
 -#~ "Befehle:\n"
 -#~ "   add - Eine CD-ROM hinzufügen\n"
 -#~ "   ident - Die Identität einer CD-ROM melden\n"
 -#~ "\n"
 -#~ "Optionen:\n"
 -#~ "  -h    Dieser Hilfetext\n"
 -#~ "  -d    CD-ROM-Einhängepunkt\n"
 -#~ "  -r    Eine erkannte CD-ROM umbenennen\n"
 -#~ "  -m    Kein Einhängen\n"
 -#~ "  -f    Schneller Modus, Paketdateien nicht überprüfen\n"
 -#~ "  -a    Gründlicher Überprüfungsmodus\n"
 -#~ "  -c=?  Diese Konfigurationsdatei lesen\n"
 -#~ "  -o=?  Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/"
 -#~ "tmp\n"
 -#~ "Siehe auch fstab(5)\n"
 -
 -#~ msgid "Internal error, non-zero counts"
 -#~ msgstr "Interner Fehler, Zähler nicht Null"
 -
 -#~ msgid "Couldn't wait for subprocess"
 -#~ msgstr "Konnte nicht auf Unterprozess warten"
 -
 -#~ msgid "....\"Have you mooed today?\"..."
 -#~ msgstr "....»Heute schon gemuht?«..."
 -
 -#~ msgid " New "
 -#~ msgstr " Neu "
 -
 -#~ msgid "B "
 -#~ msgstr "B "
 -
 -#~ msgid " files "
 -#~ msgstr " Dateien "
 -
 -#~ msgid " pkgs in "
 -#~ msgstr " Pakete in "
 -
 -#~ msgid ""
 -#~ "Usage: apt-ftparchive [options] command\n"
 -#~ "Commands: packges binarypath [overridefile [pathprefix]]\n"
 -#~ "          sources srcpath [overridefile [pathprefix]]\n"
 -#~ "          contents path\n"
 -#~ "          generate config [groups]\n"
 -#~ "          clean config\n"
 -#~ msgstr ""
 -#~ "Aufruf: apt-ftparchive [optionen] befehl\n"
 -#~ "Befehle: packages binarypath [overridefile [pathprefix]]\n"
 -#~ "         sources srcpath [overridefile [pathprefix]]\n"
 -#~ "         contents path\n"
 -#~ "         generate config [groups]\n"
 -#~ "         clean config\n"
 -
 -#~ msgid ""
 -#~ "Options:\n"
 -#~ "  -h    This help text\n"
 -#~ "  --md5 Control MD5 generation\n"
 -#~ "  -s=?  Source override file\n"
 -#~ "  -q    Quiet\n"
 -#~ "  -d=?  Select the optional caching database\n"
 -#~ "  --no-delink Enable delinking debug mode\n"
 -#~ "  --contents  Control contents file generation\n"
 -#~ "  -c=?  Read this configuration file\n"
 -#~ "  -o=?  Set an arbitrary configuration option\n"
 -#~ msgstr ""
 -#~ "Optionen:\n"
 -#~ "  -h     Dieser Hilfe-Text.\n"
 -#~ "  --md5  Steuere MD5-Generierung\n"
 -#~ "  -s=?   Binde Override-Datei ein\n"
 -#~ "  -q     Ruhig\n"
 -#~ "  -d=?   Optionale Cache-Datenbank auswählen\n"
 -#~ "  --no-delink  Debug-Modus für Delinking setzen\n"
 -#~ "  --contents   Steuere Inhaltsdatei-Generierung\n"
 -#~ "  -c=?   Lese diese Konfigurationsdatei\n"
 -#~ "  -o=?   Setze eine beliebige Konfigurations-Option\n"
 -
 -#~ msgid "Done Packages, Starting contents."
 -#~ msgstr "Fertig mit Pakete, beginne Inhalt."
 -
 -#~ msgid "Done. "
 -#~ msgstr "Fertig."
 -
 -#~ msgid "B in "
 -#~ msgstr "B in "
 -
 -#~ msgid " archives. Took "
 -#~ msgstr " Archiven. Benötigte Zeit war "
 -
 -#~ msgid "DSC file '%s' is too large!"
 -#~ msgstr "DSC-Datei »%s« ist zu groß!"
 -
 -#~ msgid "Could not find a record in the DSC '%s'"
 -#~ msgstr "Konnte keinen Eintrag im DSC »%s« finden"
 -
 -#~ msgid "Error parsing file record"
 -#~ msgstr "Fehler beim Lesen des Dateieintrags"
 -
 -#~ msgid "Failed too stat %s"
 -#~ msgstr "Kann nicht auf %s zugreifen."
 -
 -#~ msgid "Errors apply to file '%s'"
 -#~ msgstr "Fehler gehören zu Datei »%s«"
++msgid "There is no public key available for the following key IDs:\n"
++msgstr ""
++"Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n"
diff --combined po/el.po
index e924abc88,4e9e47eba..4c095317b
--- a/po/el.po
+++ b/po/el.po
@@@ -18,7 -18,7 +18,7 @@@ msgid "
  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: 2006-05-27 13:46+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2006-01-18 15:16+0200\n"
  "Last-Translator: Konstantinos Margaritis <markos@debian.org>\n"
  "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@@ -29,146 -29,146 +29,156 @@@
  "X-Generator: KBabel 1.10.2\n"
  "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Το πακέτο %s με έκδοση %s έχει ανεπίλυτες εξαρτήσεις:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Αδυναμία εντοπισμού του πακέτου %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Συνολικά Ονόματα Πακέτων : "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Κανονικά Πακέτα: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr " Πλήρως Εικονικά Πακέτα: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr " Μονά Εικονικά Πακέτα: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr " Μικτά Εικονικά Πακέτα: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "Αγνοούμενα: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Σύνολο Διαφορετικών Εκδόσεων: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Σύνολο Διαφορετικών Εκδόσεων: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Σύνολο Εξαρτήσεων: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Σύνολο Αντιστοιχίσεων Παροχών: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Σύνολο Κοινών Στοιχειοσειρών : "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Συνολικός χώρος Εξαρτήσεων Εκδόσεων: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Σύνολο χώρου ασφαλείας: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Συνολικός Καταμετρημένος Χώρος: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμένο."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Πρέπει να δώσετε ακριβώς μία παράσταση"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Δε βρέθηκαν πακέτα"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Αρχεία Πακέτου:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  "Η cache δεν είναι ενημερωμένη, αδυναμία παραπομπής σε ένα αρχείο πακέτου"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Καθηλωμένα Πακέτα:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(δε βρέθηκαν)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Εγκατεστημένα: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(κανένα)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Υποψήφιο: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr " Καθήλωση Πακέτου: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Πίνακας Έκδοσης:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s για %s %s είναι μεταγλωττισμένο σε %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -318,7 -318,7 +328,7 @@@ msgstr "
  "  -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
  "  -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Αδύνατη η εγγραφή στο %s"
@@@ -444,126 -444,115 +454,126 @@@ msgstr "Δεν ταιριαξε καμÎ
  msgid "Some files are missing in the package file group `%s'"
  msgstr "Λείπουν μερικά αρχεία από την ομάδα πακέτων '%s'"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "Η βάση είναι κατεστραμμένη, το αρχείο μετονομάστηκε σε %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "Η βάση δεν είναι ενημερωμένη, γίνεται προσπάθεια να αναβαθμιστεί το %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "Το άνοιγμά του αρχείου της βάσης %s: %s απέτυχε"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "Η ημερομηνία του αρχείου %s έχει αλλάξει"
 +msgid "Failed to stat %s"
 +msgstr "Αποτυχία εύρεσης της κατάστασης του %s."
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχου"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "Αδύνατη η πρόσβαση σε δείκτη"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "W: Αδύνατη η ανάγνωση του καταλόγου  %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "W: Αδύνατη η εύρεση της κατάστασης του %s\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "E: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "W: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "E: Σφάλματα στο αρχείο"
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "Αδύνατη η εύρεση του %s"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "Αποτυχία ανεύρεσης"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "Αποτυχία ανοίγματος του %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr "Αποσύνδεση %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "Αποτυχία ανάγνωσης του %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "Αποτυχία αποσύνδεσης του %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "    Αποτυχία σύνδεσης του %s με το %s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " Αποσύνδεση ορίου του %sB hit.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "Αποτυχία εύρεσης της κατάστασης του %s."
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr "  %s δεν περιέχει εγγραφή παράκαμψης\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "  %s συντηρητής είναι ο %s όχι ο %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, fuzzy, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr "  %s δεν περιέχει εγγραφή παράκαμψης\n"
 +
 +#: ftparchive/writer.cc:627
 +#, fuzzy, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr "  %s δεν περιέχει εγγραφή παράκαμψης\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -659,79 -648,79 +669,79 @@@ msgstr "Πρόβλημα κατά τηÎ
  msgid "Failed to rename %s to %s"
  msgstr "Αποτυχία μετονομασίας του %s σε %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "Y"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "σφάλμα μεταγλωτισμου - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "αλλά το %s είναι εγκατεστημένο"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "αλλά το %s πρόκειται να εγκατασταθεί"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "αλλά δεν είναι εγκαταστάσημο"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "αλλά είναι ένα εικονικό πακέτο"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "αλλά δεν είναι εγκατεστημένο"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "αλλά δεν πρόκειται να εγκατασταθεί"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " η"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (λόγω του %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -739,148 -728,148 +749,148 @@@ msgstr "
  "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n"
  "Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu επανεγκατεστημένα,"
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu υποβαθμισμένα, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Διόρθωση εξαρτήσεων..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " απέτυχε."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Αδύνατη η διόρθωση των εξαρτήσεων"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Ετοιμο"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr ""
  "Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
  "προβλήματα."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση [ν/Ο]; "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Υπάρχουν προβλήματα και δώσατε -y  χωρίς το --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr ""
  "Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  "Πολύ περίεργο! Τα μεγέθη δεν ταιριάζουν, στείλτε μήνυμα στο apt@packages."
  "debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB από αρχεία.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Χρειάζεται να μεταφορτωθούν %sB από αρχεία.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "Μετά την αποσυμπίεση θα χρησιμοποιηθούν %sB χώρου από το δίσκο.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Μετά την αποσυμπίεση θα ελευθερωθούν %sB χώρου από το δίσκο.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο  %s."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία"
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Ναι, κανε ότι λέω!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -891,28 -880,28 +901,28 @@@ msgstr "
  "Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Εγκατάλειψη."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Θέλετε να συνεχίσετε [Ν/ο]; "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Αποτυχία ανάκτησης του %s   %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -920,49 -909,49 +930,49 @@@ msgstr "
  "Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update "
  "ή το --fix-missing;"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr ""
  "ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Αδύνατη η επίλυση των χαμένων πακέτων."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Εγκατάλειψη της εγκατάστασης."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  "Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Το πακέτο %s είναι εικονικό και παρέχεται από τα:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Εγκατεστημένα]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Θα πρέπει επακριβώς να επιλέξετε ένα για εγκατάσταση."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -974,51 -963,51 +984,51 @@@ msgstr "
  "Αυτό σημαίνει ότι το πακέτο αυτό λείπει, είναι παλαιωμένο, ή είναι διαθέσιμο "
  "από άλλη πηγή\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Πάραυτα το ακόλουθο πακέτο το αντικαθιστά:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Το πακέτο %s δεν είναι υποψήφιο για εγκατάσταση"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr ""
  "Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή "
  "του\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Η έκδοση %s για το%s δεν βρέθηκε"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "Η εντολή update δεν παίρνει ορίσματα"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Αδύνατο το κλείδωμα του καταλόγου"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1026,25 -1015,25 +1036,46 @@@ msgstr "
  "Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα "
  "στη θέση τους."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr ""
++"Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
++"υλικό"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Αδύνατη η εύρεση του πακέτου %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "Aν τρέξετε 'apt-get f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1052,7 -1041,7 +1083,7 @@@ msgstr "
  "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
  "πακέτο (ή καθορίστε μια λύση)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1064,7 -1053,7 +1095,7 @@@ msgstr "
  "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
  "μετακινηθεί από τα εισερχόμενα."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1074,124 -1063,124 +1105,120 @@@ msgstr "
  "το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα πρέπει να κάνετε μια\n"
  "αναφορά σφάλματος για αυτό το πακέτο."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Χαλασμένα πακέτα"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Προτεινόμενα πακέτα:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Συνιστώμενα πακέτα:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Υπολογισμός της αναβάθμισης... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Απέτυχε"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Ετοιμο"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr ""
  "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
  "υλικό"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
  "κωδικάτου"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:2043
  #, fuzzy, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Μεταφόρτωση Κωδικα %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Η απογονική διεργασία απέτυχε"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1199,7 -1188,7 +1226,7 @@@
  msgstr ""
  "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1208,32 -1197,32 +1235,32 @@@ msgstr "
  "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
  "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
  "είναι νεώτερο"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Υποστηριζόμενοι Οδηγοί:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1417,19 -1406,19 +1444,19 @@@ msgstr "Σύμπτυξη Διαθέσι
  msgid "Failed to create pipes"
  msgstr "Αποτυχία κατά τη δημιουργία διασωληνώσεων"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "Αποτυχία κατά την εκτέλεση του gzip "
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Κατεστραμμένη αρχειοθήκη"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Το Checksum του tar απέτυχε, η αρχείοθήκη είναι κατεστραμμένη"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Άγνωστη επικεφαλίδα TAR τύπος %u, μέλος %s"
@@@ -1574,9 -1563,9 +1601,9 @@@ msgid "The info and temp directories ne
  msgstr "Οι φάκελοι info και temp πρέπει να βρίσκονται στο ίδιο σύστημα αρχείων"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Ανάγνωση Λιστών Πακέτων"
  
@@@ -1709,12 -1698,12 +1736,14 @@@ msgstr "Ο δίσκος δεν βρέθ
  msgid "File not found"
  msgstr "Το αρχείο Δε Βρέθηκε"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Αποτυχία εύρεσης της κατάστασης"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης"
  
@@@ -1842,7 -1831,7 +1871,7 @@@ msgstr "Λήξη χρόνου σύνδÎ
  msgid "Unable to accept connection"
  msgstr "Αδύνατη η αποδοχή συνδέσεων"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Πρόβλημα κατά το hashing του αρχείου"
  
@@@ -1926,40 -1915,40 +1955,40 @@@ msgstr "Κάτι παράξενο συÎ
  msgid "Unable to connect to %s %s:"
  msgstr "Αδύνατη η σύνδεση στο %s %s:"
  
 -#: methods/gpgv.cc:64
 +#: methods/gpgv.cc:65
  #, fuzzy, c-format
  msgid "Couldn't access keyring: '%s'"
  msgstr "Αδύνατη η εύρεση του '%s'"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr "Ε: Λίστα Ορισμάτων από Acquire::gpgv::Options πολύ μεγάλη. Έξοδος."
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
  "Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του "
  "αποτυπώματος?!"
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή."
  
 -#: methods/gpgv.cc:207
 +#: methods/gpgv.cc:213
  #, fuzzy, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
  msgstr " για την επαλήθευση της υπογραφής (είναι εγκατεστημένο το gnupg?)"
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv"
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
  msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
@@@ -1967,87 -1956,87 +1996,87 @@@ msgstr "
  "Οι παρακάτω υπογραφές δεν ήταν δυνατόν να επαληθευτούν επειδή δεν ήταν "
  "διαθέσιμο το δημόσιο κλειδί:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Αναμονή επικεφαλίδων"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Ελαττωματική γραμμή επικεφαλίδας"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Άγνωστη μορφή ημερομηνίας"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Η επιλογή απέτυχε"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Λήξη χρόνου σύνδεσης"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Σφάλμα στην εγγραφή στο αρχείο"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Σφάλμα στην εγγραφή στο αρχείο"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr ""
  "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Η σύνδεση απέτυχε"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Εσωτερικό Σφάλμα"
  
@@@ -2060,7 -2049,7 +2089,7 @@@ msgstr "Αδύνατο η απεικόÎ
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Η επιλογή %s δε βρέθηκε"
@@@ -2121,12 -2110,12 +2150,12 @@@ 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:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Σφάλμα!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Ολοκληρώθηκε"
@@@ -2262,93 -2251,93 +2291,110 @@@ msgstr "Πρόβλημα κατά τηÎ
  msgid "Problem syncing the file"
  msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Άδειο cache πακέτων"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Το αρχείο cache των πακέτων είναι ασύμβατης έκδοσης"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Αυτό το APT δεν υποστηρίζει το Σύστημα Απόδοσης Έκδοσης '%s'"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "Η cache πακέτων κατασκευάστηκε για μια διαφορετική αρχιτεκτονική"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Εξαρτάται από"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "ΠροΕξαρτάται από"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Προτείνει"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Συστήνει"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Ασύμβατο με"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Αντικαθιστά"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Απαρχαιώνει"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "σημαντικό"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "απαιτούμενο"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "καθιερωμένο"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "προαιρετικό"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "επιπλέον"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Κατασκευή Δένδρου Εξαρτήσεων"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Υποψήφιες Εκδόσεις"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Παραγωγή Εξαρτήσεων"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Αποτυχία ανοίγματος του %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Αποτυχία εγγραφής του αρχείου %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)"
@@@ -2383,7 -2372,7 +2429,7 @@@ msgstr "Λάθος μορφή της γ
  msgid "Opening %s"
  msgstr "Άνοιγμα του %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s."
@@@ -2420,7 -2409,7 +2466,7 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
@@@ -2428,7 -2417,7 +2474,7 @@@ msgstr "
  "Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση "
  "κάποιας κατάλληλης αρχείοθήκης."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2436,7 -2425,7 +2482,7 @@@ msgstr "
  "Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως "
  "προκλήθηκε από κρατούμενα πακέτα."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα."
  
@@@ -2479,12 -2468,12 +2525,12 @@@ msgstr "
  "Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
  "enter."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων"
  
@@@ -2521,102 -2510,102 +2567,118 @@@ msgid "No priority (or zero) specified 
  msgstr ""
  "Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  "Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το "
  "APT."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  "Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Συλλογή Παροχών Αρχείου"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "Ανόμοιο MD5Sum"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
  msgid "There are no public key available for the following key IDs:\n"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2625,7 -2614,7 +2687,7 @@@ msgstr "
  "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
  "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2634,7 -2623,7 +2696,7 @@@ msgstr "
  "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
  "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
@@@ -2642,7 -2631,7 +2704,7 @@@ msgstr "
  "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
  "πακέτο %s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Ανόμοιο μέγεθος"
  
@@@ -2651,7 -2640,7 +2713,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Η εγγραφή κατασκευαστή %s δεν περιέχει ταυτότητα"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2660,47 -2649,47 +2722,49 @@@ msgstr "
  "Χρησιμοποιείται το σημείο προσάρτησης %s\n"
  "Προσαρτάται το CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Αναγνώριση..."
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Αποθήκευση Ετικέτας: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Χρησιμοποιείται το σημείο προσάρτησης %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Αποπροσάρτηση του CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Αναμονή για δίσκο...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Προσάρτηση του CD-ROM...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Σάρωση του δίσκου για περιεχόμενα...\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "Βρέθηκαν %i κατάλογοι πακέτων, %i κατάλογοι πηγαίων και %i υπογραφές\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Αυτό δεν είναι έγκυρο όνομα, προσπαθείστε ξανά. \n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2709,38 -2698,38 +2773,38 @@@ msgstr "
  "Ο δίσκος αυτός ονομάζεται: \n"
  "'%s'\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Αντιγραφή λιστών πακέτων..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Eγγραφή νέας λίστας πηγών\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Αποπροσάρτηση του CD-ROM..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Εγιναν %i εγγραφές.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n"
@@@ -2795,17 -2784,31 +2859,22 @@@ msgstr "Προετοιμασία ρύθ
  msgid "Completely removed %s"
  msgstr "Αποτυχία διαγραφής του %s"
  
++#: methods/rred.cc:219
++#, fuzzy
++msgid "Could not patch file"
++msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
++
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Η σύνδεση έκλεισε πρόωρα"
  
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
++#: apt-pkg/acquire-item.cc:1097
++msgid "There is no public key available for the following key IDs:\n"
+ msgstr ""
+ 
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr "  %s δεν περιέχει εγγραφή παράκαμψης\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr "  %s δεν περιέχει εγγραφή παράκαμψης\n"
 -
 -#: methods/rred.cc:219
 -#, fuzzy
 -msgid "Could not patch file"
 -msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
 +#~ msgid "File date has changed %s"
 +#~ msgstr "Η ημερομηνία του αρχείου %s έχει αλλάξει"
  
- #, fuzzy
- #~ msgid "Could not patch file"
- #~ msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
- 
  #~ msgid "Reading file list"
  #~ msgstr "Ανάγνωση Λιστών Αρχείων"
  
diff --combined po/en_GB.po
index bc2153efe,4ff5bba65..4d6742658
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@@ -1,159 -1,159 +1,169 @@@
  # English messages for the apt suite.
  # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.
  # Michael Piefel <piefel@informatik.hu-berlin.de>, 2002.
 -#
 -#
 +# 
 +# 
  msgid ""
  msgstr ""
 -"Project-Id-Version: apt 0.5.5\n"
 +"Project-Id-Version: apt 0.6.46.2\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-05-27 13:46+0200\n"
 -"PO-Revision-Date: 2002-11-10 20:56+0100\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
 +"PO-Revision-Date: 2006-10-12 11:07+0100\n"
  "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
 -"Language-Team: en_GB <en@li.org>\n"
 +"Language-Team: en_GB <en_gb@li.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Package %s version %s has an unmet dep:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Unable to locate package %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Total package names : "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Normal packages: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Pure virtual packages: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Single virtual packages: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Mixed virtual packages: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Missing: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Total distinct versions: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Total distinct versions: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Total dependencies: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Total ver/file relations: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Total ver/file relations: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Total Provides mappings: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Total globbed strings: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Total dependency version space: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Total slack space: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Total space accounted for: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Package file %s is out of sync."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "You must give exactly one pattern"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "No packages found"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Package files:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "Cache is out of sync, can't x-ref a package file"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Pinned packages:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(not found)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Installed: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(none)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Candidate: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Package pin: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Version table:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s for %s %s compiled on %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -300,7 -300,7 +310,7 @@@ msgstr "
  "  -c=? Read this configuration file\n"
  "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Unable to write to %s"
@@@ -422,128 -422,115 +432,128 @@@ msgstr "No selections matched
  msgid "Some files are missing in the package file group `%s'"
  msgstr "Some files are missing in the package file group ‘%s’"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "DB was corrupted, file renamed to %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "DB is old, attempting to upgrade %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "Unable to open DB file %s: %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "File date has changed %s"
 +msgid "Failed to stat %s"
 +msgstr "Failed to stat %s"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "Archive has no control record"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "Unable to get a cursor"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "W: Unable to read directory %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "W: Unable to stat %s\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
 -msgstr "E:"
 +msgstr "E: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
 -msgstr "W:"
 +msgstr "W: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "E: Errors apply to file "
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "Could not resolve ‘%s’"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "Tree walking failed"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "Failed to open %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr " DeLink %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "Failed to readlink %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "Failed to unlink %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** Failed to link %s to %s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " DeLink limit of %sB hit.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "Failed to stat %s"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "Archive had no package field"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr "  %s has no override entry\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "  %s maintainer is %s not %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr "  %s has no source override entry\n"
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr "  %s has no binary override entry either\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -615,7 -602,7 +625,7 @@@ msgstr "Failed to create subprocess IPC
  
  #: ftparchive/multicompress.cc:324
  msgid "Failed to exec compressor "
 -msgstr "Failed to exec compressor"
 +msgstr "Failed to exec compressor "
  
  #: ftparchive/multicompress.cc:363
  msgid "decompressor"
@@@ -639,79 -626,79 +649,79 @@@ msgstr "Problem unlinking %s
  msgid "Failed to rename %s to %s"
  msgstr "Failed to rename %s to %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "Y"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Regex compilation error - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "The following packages have unmet dependencies."
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "but %s is installed"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "but %s is to be installed"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "but it is not installable"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "but it is a virtual package"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "but it is not installed"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "but it is not going to be installed"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
 -msgstr "or"
 +msgstr " or"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "The following NEW packages will be installed"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "The following packages will be REMOVED"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "The following packages have been kept back:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "The following packages will be upgraded:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "The following packages will be DOWNGRADED:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "The following held packages will be changed:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (due to %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -719,143 -706,143 +729,143 @@@ msgstr "
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu upgraded, %lu newly installed, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu reinstalled, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu downgraded, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu to remove and %lu not upgraded.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu not fully installed or removed.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Correcting dependencies..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " failed."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Unable to correct dependencies"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
 -msgstr "Unable to minimize the upgrade set"
 +msgstr "Unable to minimise the upgrade set"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr "Done"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "You might want to run ‘apt-get -f install’ to correct these."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Unmet dependencies. Try using -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "WARNING: The following packages cannot be authenticated!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "Authentication warning overridden.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Install these packages without verification [y/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Some packages could not be authenticated"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "There are problems and -y was used without --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "Internal error, InstallPackages was called with broken packages!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Packages need to be removed but remove is disabled."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Internal error, Ordering didn't finish"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Unable to lock the download directory"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "The list of sources could not be read."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr "How odd.. The sizes didn't match, email apt@packages.debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Need to get %sB/%sB of archives.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Need to get %sB of archives.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "After unpacking %sB of additional disk space will be used.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "After unpacking %sB disk space will be freed.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Couldn't determine free space in %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "You don't have enough free space in %s."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "Trivial Only specified but this is not a trivial operation."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Yes, do as I say!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -866,28 -853,28 +876,28 @@@ msgstr "
  "To continue type in the phrase ‘%s’\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Abort."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Do you want to continue [Y/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Failed to fetch %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Some files failed to download"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Download complete and in download only mode"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -895,47 -882,47 +905,47 @@@ msgstr "
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing and media swapping is not currently supported"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Unable to correct missing packages."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Aborting install."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Note, selecting %s for regex ‘%s’\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr "Skipping %s, it is already installed and upgrade is not set.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Package %s is not installed, so not removed\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Package %s is a virtual package provided by:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Installed]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "You should explicitly select one to install."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -946,49 -933,49 +956,49 @@@ msgstr "
  "This may mean that the package is missing, has been obsoleted, or\n"
  "is only available from another source\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "However the following packages replace it:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Package %s has no installation candidate"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s is already the newest version.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Release ‘%s’ for ‘%s’ was not found"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Version ‘%s’ for ‘%s’ was not found"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Selected version %s (%s) for %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "The update command takes no arguments"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Unable to lock the list directory"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -996,25 -983,25 +1006,44 @@@ msgstr "
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "The following information may help to resolve the situation:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Internal error, problem resolver broke stuff"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Internal error, AllUpgrade broke stuff"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Couldn't find package %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Note, selecting %s for regex ‘%s’\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "You might want to run ‘apt-get -f install’ to correct these:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1022,7 -1009,7 +1051,7 @@@ msgstr "
  "Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a "
  "solution)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1034,7 -1021,7 +1063,7 @@@ msgstr "
  "distribution that some required packages have not yet been created\n"
  "or been moved out of Incoming."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1044,119 -1031,119 +1073,115 @@@ msgstr "
  "the package is simply not installable and a bug report against\n"
  "that package should be filed."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "The following information may help to resolve the situation:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Broken packages"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "The following extra packages will be installed:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Suggested packages:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Recommended packages:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
 -msgstr "Calculating upgrade..."
 +msgstr "Calculating upgrade... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Failed"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Done"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Internal error, problem resolver broke stuff"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "Must specify at least one package for which to fetch source"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Unable to find a source package for %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
 -#, fuzzy, c-format
++#: cmdline/apt-get.cc:2043
 +#, c-format
  msgid "Skipping already downloaded file '%s'\n"
 -msgstr "Skipping unpack of already unpacked source in %s\n"
 +msgstr "Skipping already downloaded file '%s'\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "You don't have enough free space in %s"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Need to get %sB/%sB of source archives.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Need to get %sB of source archives.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Fetch source %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Failed to fetch some archives."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Skipping unpack of already unpacked source in %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Unpack command ‘%s’ failed.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Check if the 'dpkg-dev' package is installed.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Build command ‘%s’ failed.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Child process failed"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr "Must specify at least one package to check builddeps for"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Unable to get build-dependency information for %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s has no build depends.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1165,7 -1152,7 +1190,7 @@@ msgstr "
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1174,31 -1161,31 +1199,31 @@@ msgstr "
  "%s dependency for %s cannot be satisfied because no available versions of "
  "package %s can satisfy version requirements"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Failed to satisfy %s dependency for %s: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Build-dependencies for %s could not be satisfied."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Failed to process build dependencies"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Supported modules:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1292,7 -1279,7 +1317,7 @@@ msgstr "Ign 
  
  #: cmdline/acqprogress.cc:114
  msgid "Err "
 -msgstr "Err"
 +msgstr "Err "
  
  #: cmdline/acqprogress.cc:135
  #, c-format
@@@ -1378,19 -1365,19 +1403,19 @@@ msgstr "Merging available information
  msgid "Failed to create pipes"
  msgstr "Failed to create pipes"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "Failed to exec gzip "
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Corrupted archive"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Tar checksum failed, archive corrupted"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Unknown TAR header type %u, member %s"
@@@ -1535,9 -1522,9 +1560,9 @@@ msgid "The info and temp directories ne
  msgstr "The info and temp directories need to be on the same filesystem"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Reading package lists"
  
@@@ -1596,7 -1583,7 +1621,7 @@@ msgstr "Internal error adding a diversi
  
  #: apt-inst/deb/dpkgdb.cc:383
  msgid "The pkg cache must be initialized first"
 -msgstr "The pkg cache must be initialized first"
 +msgstr "The pkg cache must be initialised first"
  
  #: apt-inst/deb/dpkgdb.cc:443
  #, c-format
@@@ -1670,12 -1657,12 +1695,14 @@@ msgstr "Disk not found.
  msgid "File not found"
  msgstr "File not found"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Failed to stat"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Failed to set modification time"
  
@@@ -1803,7 -1790,7 +1830,7 @@@ msgstr "Data socket connect timed out
  msgid "Unable to accept connection"
  msgstr "Unable to accept connection"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Problem hashing file"
  
@@@ -1887,39 -1874,39 +1914,39 @@@ msgstr "Something wicked happened resol
  msgid "Unable to connect to %s %s:"
  msgstr "Unable to connect to %s %s:"
  
 -#: methods/gpgv.cc:64
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:65
 +#, c-format
  msgid "Couldn't access keyring: '%s'"
 -msgstr "Could not resolve ‘%s’"
 +msgstr "Couldn't access keyring: '%s'"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr "At least one invalid signature was encountered."
  
 -#: methods/gpgv.cc:207
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:213
 +#, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 -msgstr " to verify signature (is gnupg installed?)"
 +msgstr "Could not execute '%s' to verify signature (is gnupg installed?)"
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr "Unknown error executing gpgv"
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
  msgstr "The following signatures were invalid:\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
@@@ -1927,86 -1914,86 +1954,86 @@@ msgstr "
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Couldn't open pipe for %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Read error from %s process"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Waiting for headers"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Got a single header line over %u chars"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Bad header line"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "The HTTP server sent an invalid reply header"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "The HTTP server sent an invalid Content-Length header"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "The HTTP server sent an invalid Content-Range header"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "This HTTP server has broken range support"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Unknown date format"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Select failed"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Connection timed out"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Error writing to output file"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Error writing to file"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Error writing to the file"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Error reading from server. Remote end closed connection"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Error reading from server"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Bad header data"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Connection failed"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Internal error"
  
@@@ -2019,7 -2006,7 +2046,7 @@@ msgstr "Cannot mmap an empty file
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Couldn't make mmap of %lu bytes"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Selection %s not found"
@@@ -2079,12 -2066,12 +2106,12 @@@ msgstr "Syntax error %s:%u: Unsupporte
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Syntax error %s:%u: Extra junk at end of file"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Error!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Done"
@@@ -2216,93 -2203,93 +2243,110 @@@ msgstr "Problem unlinking the file
  msgid "Problem syncing the file"
  msgstr "Problem syncing the file"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Empty package cache"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "The package cache file is corrupted"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "The package cache file is an incompatible version"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "This APT does not support the Versioning System ‘%s’"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "The package cache was built for a different architecture"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Depends"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "PreDepends"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Suggests"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Recommends"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Conflicts"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Replaces"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Obsoletes"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "important"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "required"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "standard"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "optional"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Building dependency tree"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Candidate versions"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Dependency generation"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Merging available information"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Failed to open %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Failed to write file ‘%s’"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Unable to parse package file %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Unable to parse package file %s (2)"
@@@ -2337,7 -2324,7 +2381,7 @@@ msgstr "Malformed line %lu in source li
  msgid "Opening %s"
  msgstr "Opening %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Line %u too long in source list %s."
@@@ -2373,14 -2360,14 +2417,14 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Index file type ‘%s’ is not supported"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  "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:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2388,7 -2375,7 +2432,7 @@@ msgstr "
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr "Unable to correct problems, you have held broken packages."
  
@@@ -2405,14 -2392,14 +2449,14 @@@ msgstr "Archive directory %spartial is 
  #. only show the ETA if it makes sense
  #. two days
  #: apt-pkg/acquire.cc:823
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li (%s remaining)"
 -msgstr "Downloading file %li of %li (%s remaining)"
 +msgstr "Retrieving file %li of %li (%s remaining)"
  
  #: apt-pkg/acquire.cc:825
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li"
 -msgstr "Reading file listing"
 +msgstr "Retrieving file %li of %li"
  
  #: apt-pkg/acquire-worker.cc:113
  #, c-format
@@@ -2430,12 -2417,12 +2474,12 @@@ msgid "Please insert the disc labeled: 
  msgstr ""
  "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Packaging system ‘%s’ is not supported"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Unable to determine a suitable packaging system type"
  
@@@ -2469,100 -2456,99 +2513,116 @@@ msgstr "Did not understand pin type %s
  msgid "No priority (or zero) specified for pin"
  msgstr "No priority (or zero) specified for pin"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Cache has an incompatible versioning system"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Error occurred while processing %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Error occurred while processing %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Error occurred while processing %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Error occurred while processing %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Error occurred while processing %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Error occurred while processing %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Error occurred while processing %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Error occurred while processing %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Error occurred while processing %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr "Wow, you exceeded the number of package names this APT can handle.."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "Wow, you exceeded the number of versions this APT can handle."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "Wow, you exceeded the number of versions this APT can handle."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr "Wow, you exceeded the number of dependencies this APT can handle."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Error occurred while processing %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Error occurred while processing %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "Package %s %s was not found while processing file dependencies"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Couldn't stat source package list %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Collecting File Provides"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "IO Error saving source cache"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "rename failed, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "MD5Sum mismatch"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
 -msgstr ""
 +msgstr "There is no public key available for the following key IDs:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2571,7 -2557,7 +2631,7 @@@ msgstr "
  "I wasn't able to locate a file for the %s package. This might mean you need "
  "to manually fix this package. (due to missing arch)"
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2580,14 -2566,14 +2640,14 @@@ msgstr "
  "I wasn't able to locate file for the %s package. This might mean you need to "
  "manually fix this package."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  "The package index files are corrupted. No Filename: field for package %s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Size mismatch"
  
@@@ -2596,7 -2582,7 +2656,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Vendor block %s contains no fingerprint"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2605,47 -2591,47 +2665,49 @@@ msgstr "
  "Using CD-ROM mount point %s\n"
  "Mounting CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Identifying.. "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Stored label: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Using CD-ROM mount point %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Unmounting CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Waiting for disc...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Mounting CD-ROM...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Scanning disc for index files..\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "Found %i package indexes, %i source indexes and %i signatures\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "That is not a valid name, try again.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2654,38 -2640,38 +2716,38 @@@ msgstr "
  "This disc is called: \n"
  "'%s'\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Copying package lists..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Writing new source list\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Source list entries for this disc are:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Unmounting CD-ROM..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Wrote %i records.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Wrote %i records with %i missing files.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Wrote %i records with %i mismatched files\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr "Wrote %i records with %i missing files and %i mismatched files\n"
@@@ -2731,18 -2717,75 +2793,24 @@@ msgid "Removed %s
  msgstr "Removed %s"
  
  #: apt-pkg/deb/dpkgpm.cc:378
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing to completely remove %s"
 -msgstr "Preparing to configure %s"
 +msgstr "Preparing to completely remove %s"
  
  #: apt-pkg/deb/dpkgpm.cc:379
 -#, fuzzy, c-format
 +#, c-format
  msgid "Completely removed %s"
 -msgstr "Failed to remove %s"
 +msgstr "Completely removed %s"
 +
++#: methods/rred.cc:219
++msgid "Could not patch file"
++msgstr "Could not patch file"
+ 
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Connection closed prematurely"
  
- #~ msgid "Could not patch file"
- #~ msgstr "Could not patch file"
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
 -msgstr ""
 -
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr "  %s has no override entry\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr "  %s has no override entry\n"
 -
 -#: methods/rred.cc:219
++#: apt-pkg/acquire-item.cc:1097
+ #, fuzzy
 -msgid "Could not patch file"
 -msgstr "Could not open file %s"
 -
 -#~ msgid "Reading file list"
 -#~ msgstr "Reading file list"
 -
 -#~ msgid "Could not execute "
 -#~ msgstr "Could not execute "
 -
 -#~ msgid "Preparing for remove with config %s"
 -#~ msgstr "Preparing for remove with config %s"
 -
 -#~ msgid "Removed with config %s"
 -#~ msgstr "Removed with config %s"
 -
 -#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 -#~ msgstr "Unknown vendor ID ‘%s’ in line %u of source list %s"
 -
 -#~ msgid ""
 -#~ "Some broken packages were found while trying to process build-"
 -#~ "dependencies.\n"
 -#~ "You might want to run `apt-get -f install' to correct these."
 -#~ msgstr ""
 -#~ "Some broken packages were found while trying to process build-"
 -#~ "dependencies.\n"
 -#~ "You might want to run ‘apt-get -f install’ to correct these."
 -
 -#~ msgid "<- '"
 -#~ msgstr "<- ‘"
 -
 -#~ msgid "'"
 -#~ msgstr "‘"
 -
 -#~ msgid "-> '"
 -#~ msgstr "-> ‘"
 -
 -#~ msgid " '"
 -#~ msgstr " ‘"
 -
 -#~ msgid "....\"Have you mooed today?\"..."
 -#~ msgstr "....‘Have you mooed today?’..."
++msgid "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"
diff --combined po/es.po
index a9952f38c,b8016c4d4..8be22799e
--- a/po/es.po
+++ b/po/es.po
@@@ -1,164 -1,162 +1,174 @@@
 -# Advanced Package Transfer - APT message translation catalog
 -# Copyright (C) 2002 Free Software Foundation, Inc.
 -# Rafael Sepúlveda <drs@gnulinux.org.mx>, 2002.
 -# Asier Llano Palacios <asierllano@infonegocio.com>
 -# Javier Fernández-Sanguino Peña <jfs@debian.org> 2003
 -# Rubén Porras Campo <nahoo@inicia.es> 2004
 +# Advanced Package Transfer - APT message translation catalog
 +# Copyright (C) 2002 Free Software Foundation, Inc.
 +# Rafael Sepulveda <drs@gnulinux.org.mx>, 2002.
 +# Asier Llano Palacios <asierllano@infonegocio.com>
 +# Javier Fernandez-Sanguino Pena <jfs@debian.org> 2003
 +# Ruben Porras Campo <nahoo@inicia.es> 2004
 +# Javier Fernandez-Sanguino <jfs@debian.org> 2006
 +# 
  msgid ""
  msgstr ""
  "Project-Id-Version: apt 0.6.42.3exp1\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-05-27 13:46+0200\n"
 -"PO-Revision-Date: 2005-11-16 17:37+0100\n"
 -"Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n"
 -"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
 +"PO-Revision-Date: 2006-10-08 00:23+0200\n"
 +"Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
 +"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=ISO-8859-1\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "El paquete %s versión %s tiene dependencias incumplidas:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "No se ha podido localizar el paquete %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Nombres de paquetes totales: "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Paquetes normales: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Paquetes virtuales puros: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Paquetes virtuales únicos: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Paquetes virtuales mixtos: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Faltan: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Versiones diferentes totales: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Versiones diferentes totales: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Dependencias totales: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Relaciones versión/archivo totales: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Relaciones versión/archivo totales: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Mapeo Total de Provisiones: "
  
  # globbed -> globalizadas ? (jfs)
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Cadenas globalizadas totales: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Espacio de versión de dependencias total: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Espacio desperdiciado total: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Espacio registrado total: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "El archivo de paquetes %s está desincronizado."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Debe dar exactamente un patrón"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "No se encontró ningún paquete"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Archivos de paquetes:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  "Caché fuera de sincronismo, no se puede hacer x-ref a un archivo de paquetes"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Paquetes con pin:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(no encontrado)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Instalados: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(ninguno)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Candidato: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Pin del paquete: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Tabla de versión:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s para %s %s compilado en %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -310,7 -308,7 +320,7 @@@ msgstr "
  "  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::"
  "cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "No se puede escribir en %s"
@@@ -437,128 -435,115 +447,128 @@@ msgstr "Ninguna selección coincide
  msgid "Some files are missing in the package file group `%s'"
  msgstr "Faltan algunos archivos en el grupo de archivo de paquetes `%s'"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "BD corrompida, archivo renombrado a %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "DB anticuada, intentando actualizar %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +"El formato de la base de datos no es válido. Debe eliminar y recrear la base "
 +"de datos si ha actualizado de una versión anterior de apt."
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "No se pudo abrir el archivo DB %s: %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "Cambió la fecha del archivo %s"
 +msgid "Failed to stat %s"
 +msgstr "No pude leer %s"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "No hay registro de control del archivo"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "No se pudo obtener un cursor"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "A: No se pudo leer directorio %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "A: No se pudo leer %s\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "E: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "A: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "E: Errores aplicables al archivo '"
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "No se pudo resolver %s"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "Falló el recorrido por el árbol."
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "No se pudo abrir %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr " DeLink %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "No se pudo leer el enlace %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "No se pudo desligar %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** No pude enlazar %s con %s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " DeLink se ha llegado al límite de %sB.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "No pude leer %s"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "Archivo no tiene campo de paquetes"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr " %s no tiene entrada de predominio\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr " el encargado de %s es %s y no %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr " %s no tiene una entrada fuente predominante\n"
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr " %s tampoco tiene una entrada binaria predominante\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -654,79 -639,79 +664,79 @@@ msgstr "Hay problemas desligando %s
  msgid "Failed to rename %s to %s"
  msgstr "Falló el renombre de %s a %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "S"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Error de compilación de expresiones regulares - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "pero %s está instalado"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "pero %s va a ser instalado"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "pero no es instalable"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "pero es un paquete virtual"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "pero no está instalado"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "pero no va a instalarse"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " o"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Se instalarán los siguientes paquetes NUEVOS:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Los siguientes paquetes se ELIMINARÁN:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Los siguientes paquetes se han retenido:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Se actualizarán los siguientes paquetes:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Se DESACTUALIZARÁN los siguientes paquetes:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Se cambiarán los siguientes paquetes retenidos:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (por %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -734,146 -719,146 +744,146 @@@ msgstr "
  "AVISO: Se van a eliminar los siguientes paquetes esenciales.\n"
  "¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu actualizados, %lu se instalarán, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu reinstalados, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu desactualizados, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu para eliminar y %lu no actualizados.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu no instalados del todo o eliminados.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Corrigiendo dependencias..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " falló."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "No se puede corregir las dependencias"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "No se puede minimizar el conjunto de actualización"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Listo"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "AVISO: ¡No se han podido autenticar los siguientes paquetes!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "Aviso de autenticación ignorado.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "¿Instalar estos paquetes sin verificación [s/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Algunos paquetes no se pueden autenticar"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Hay problemas y se utilizó -y sin --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "Error interno, InstallPackages fue llamado con un paquete roto!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Los paquetes necesitan eliminarse pero Remove está deshabilitado."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Error interno, no terminó el ordenamiento"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "No se puede bloquear el directorio de descarga"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "No se pudieron leer las listas de fuentes."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  "Que raro.. Los tamaños no concuerdan, mande un correo a \n"
  "apt@packages.debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Se necesita descargar %sB/%sB de archivos.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Necesito descargar %sB de archivos.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr ""
  "Se utilizarán %sB de espacio de disco adicional después de desempaquetar.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Se liberarán %sB después de desempaquetar.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "No pude determinar el espacio libre en %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "No tiene suficiente espacio libre en %s."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "Se especificó Trivial Only pero ésta no es una operación trivial."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Sí, ¡haga lo que le digo!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -884,28 -869,28 +894,28 @@@ msgstr "
  "Para continuar escriba la frase «%s»\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Abortado."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "¿Desea continuar [S/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Imposible obtener %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Algunos archivos no pudieron descargarse"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Descarga completa y en modo de sólo descarga"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -913,47 -898,47 +923,47 @@@ msgstr "
  "No se pudieron obtener algunos archivos, ¿quizás deba ejecutar\n"
  "apt-get update o deba intentarlo de nuevo con --fix-missing?"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "Actualmente no están soportados --fix-missing e intercambio de medio"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "No se pudieron corregir los paquetes que faltan."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Abortando la instalación."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Nota, seleccionando %s en lugar de %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr "Ignorando %s, ya esta instalado y la actualización no esta activada.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "El paquete %s no esta instalado, no se eliminará\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "El paquete %s es un paquete virtual provisto por:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Instalado]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Necesita seleccionar explícitamente uno para instalar."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -964,49 -949,49 +974,49 @@@ msgstr "
  "a él. Esto puede significar que el paquete falta, está obsoleto o sólo se\n"
  "encuentra disponible desde alguna otra fuente\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Sin embargo, los siguientes paquetes lo reemplazan:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "El paquete %s no tiene candidato para su instalación"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s ya está en su versión más reciente.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "No se encontró la Distribución '%s' para '%s'"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "No se encontró la versión '%s' para '%s'"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Versión seleccionada %s (%s) para %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "El comando de actualización no toma argumentos"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "No se pudo bloquear el directorio de listas"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1014,25 -999,25 +1024,46 @@@ msgstr "
  "Algunos archivos de índice no se han podido descargar, se han ignorado,\n"
  "o se ha utilizado unos antiguos en su lugar."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "La siguiente información puede ayudar a resolver la situación:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr ""
++"Error interno, el sistema de solución de problemas rompió\n"
++"algunas cosas"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Error Interno, AllUpgrade rompió cosas"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "No se pudo encontrar el paquete %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Nota, seleccionando %s para la expresión regular '%s'\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1040,7 -1025,7 +1071,7 @@@ msgstr "
  "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o "
  "especifique una solución)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1052,7 -1037,7 +1083,7 @@@ msgstr "
  "inestable, que algunos paquetes necesarios no han sido creados o han\n"
  "sido movidos fuera de Incoming."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1062,123 -1047,123 +1093,119 @@@ msgstr "
  "paquete simplemente no sea instalable y debería de rellenar un informe de\n"
  "error contra ese paquete."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "La siguiente información puede ayudar a resolver la situación:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Paquetes rotos"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Se instalarán los siguientes paquetes extras:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Paquetes sugeridos:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Paquetes recomendados"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Calculando la actualización... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Falló"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Listo"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr ""
  "Error interno, el sistema de solución de problemas rompió\n"
  "algunas cosas"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "Debe especificar al menos un paquete para obtener su código fuente"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "No se pudo encontrar un paquete de fuentes para %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
 -#, fuzzy, c-format
++#: cmdline/apt-get.cc:2043
 +#, c-format
  msgid "Skipping already downloaded file '%s'\n"
 -msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
 +msgstr "Ignorando fichero ya descargado '%s'\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "No tiene suficiente espacio libre en %s"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Necesito descargar %sB/%sB de archivos fuente.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Necesito descargar %sB de archivos fuente.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Fuente obtenida %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "No se pudieron obtener algunos archivos."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Falló la orden de desempaquetamiento '%s'.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Falló la orden de construcción '%s'.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Falló el proceso hijo"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "Debe especificar al menos un paquete para verificar sus\n"
  "dependencias de construcción"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "No se pudo obtener información de dependencias de construcción para %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s no tiene dependencias de construcción.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1187,7 -1172,7 +1214,7 @@@ msgstr "
  "La dependencia %s en %s no puede satisfacerse porque no se puede \n"
  "encontrar el paquete %s"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1196,32 -1181,32 +1223,32 @@@ msgstr "
  "La dependencia %s en %s no puede satisfacerse porque ninguna versión\n"
  "disponible del paquete %s satisface los requisitos de versión"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es "
  "demasiado nuevo"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "No se pudo satisfacer la dependencia %s para %s: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "No se pudieron satisfacer las dependencias de construcción de %s."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "No se pudieron procesar las dependencias de construcción"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Módulos soportados:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1409,19 -1394,19 +1436,19 @@@ msgstr "Fusionando información disponib
  msgid "Failed to create pipes"
  msgstr "No pude crear las tuberías"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "No pude ejecutar gzip"
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Archivo corrompido"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "No se aprobó la suma de control del tar, archive corrompido"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Cabecera del TAR tipo %u desconocida, miembro %s"
@@@ -1567,9 -1552,9 +1594,9 @@@ msgstr "
  "Los directorios info y temp deben de estar en el mismo sistema de archivos"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Leyendo lista de paquetes"
  
@@@ -1702,12 -1687,12 +1729,14 @@@ msgstr "Disco no encontrado.
  msgid "File not found"
  msgstr "Fichero no encontrado"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "No pude leer"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "No pude poner el tiempo de modificación"
  
@@@ -1835,7 -1820,7 +1864,7 @@@ msgstr "Expiró conexión a socket de dat
  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:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Hay problemas enlazando fichero"
  
@@@ -1919,41 -1904,40 +1948,41 @@@ msgstr "Algo raro pasó resolviendo '%s:
  msgid "Unable to connect to %s %s:"
  msgstr "No pude conectarme a %s %s:"
  
 -#: methods/gpgv.cc:64
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:65
 +#, c-format
  msgid "Couldn't access keyring: '%s'"
 -msgstr "No pude resolver '%s'"
 +msgstr "No se pudo acceder al anillo de claves: '%s'"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr ""
  "E: Lista de argumentos de Acquire::gpgv::Options demasiado larga. Terminando."
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
  "Error interno: Firma correcta, pero no se pudo determinar su huella digital?!"
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr "Se encontró al menos una firma inválida."
  
 -#: methods/gpgv.cc:207
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:213
 +#, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 -msgstr " para verificar la firma (¿está instalado gnupg?)"
 +msgstr ""
 +"No se pudo ejecutar '%s'  para verificar la firma (¿está instalado gnupg?)"
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr "Error desconocido ejecutando gpgv"
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
  msgstr "Las siguientes firms fueron inválidas:\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
@@@ -1961,86 -1945,86 +1990,86 @@@ msgstr "
  "Las firmas siguientes no se pudieron verificar porque su llave pública no "
  "está disponible:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "No pude abrir una tubería para %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Error de lectura de %s procesos"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Esperando las cabeceras"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Obtuve una sola línea de cabecera arriba de %u caracteres"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Mala línea de cabecera"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "El servidor de http envió una cabecera de respuesta inválida"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "El servidor de http envió una cabecera de Content-Length inválida"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "El servidor de http envió una cabecera de Content-Range inválida"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "Éste servidor de http tiene el soporte de alcance roto"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Formato de fecha desconocido"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Falló la selección"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Expiró la conexión"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Error escribiendo al archivo de salida"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Error escribiendo a archivo"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Error escribiendo al archivo"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Error leyendo del servidor, el lado remoto cerró la conexión."
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Error leyendo del servidor"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Mala cabecera Data"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Fallo la conexión"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Error interno"
  
@@@ -2053,7 -2037,7 +2082,7 @@@ msgstr "No puedo hacer mmap de un fiche
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "No pude hacer mmap de %lu bytes"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Selección %s no encontrada"
@@@ -2115,12 -2099,12 +2144,12 @@@ msgstr "Error de sintaxis %s:%u: Direct
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Error de sintaxis %s:%u: Basura extra al final del archivo"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... ¡Error!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Hecho"
@@@ -2254,93 -2238,93 +2283,110 @@@ msgstr "Hay problemas desligando el fic
  msgid "Problem syncing the file"
  msgstr "Hay problemas sincronizando el fichero"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Caché de paquetes vacía."
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "El archivo de caché de paquetes esta corrompido"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "El archivo de caché de paquetes es una versión incompatible"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Este APT no soporta el sistema de versiones '%s'"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "La caché de paquetes se había creado para una arquitectura diferente"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Depende"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "PreDepende"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Sugiere"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Recomienda"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Entra en conflicto"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Reemplaza"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Hace obsoleto"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "importante"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "requiere"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "estándar"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "opcional"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Creando árbol de dependencias"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Versiones candidatas"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Generación de dependencias"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Fusionando información disponible"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "No se pudo abrir %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Falló la escritura del archivo %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "No se pudo tratar el archivo de paquetes %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "No se pudo tratar el archivo de paquetes %s (2)"
@@@ -2375,7 -2359,7 +2421,7 @@@ msgstr "Línea %lu mal formada en lista 
  msgid "Opening %s"
  msgstr "Abriendo %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Línea %u demasiado larga en la lista de fuentes %s."
@@@ -2412,7 -2396,7 +2458,7 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "No se da soporte para el tipo de archivo de índice '%s'"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
@@@ -2420,7 -2404,7 +2466,7 @@@ msgstr "
  "El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para "
  "éste."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2428,7 -2412,7 +2474,7 @@@ msgstr "
  "Error, pkgProblemResolver::Resolve generó cortes, esto puede haber sido "
  "causado por paquetes retenidos."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  "No se pudieron corregir los problemas, usted ha retenido paquetes\n"
@@@ -2447,14 -2431,14 +2493,14 @@@ msgstr "Falta el directorio de archivo
  #. only show the ETA if it makes sense
  #. two days
  #: apt-pkg/acquire.cc:823
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li (%s remaining)"
  msgstr "Descargando fichero %li de %li (falta %s)"
  
  #: apt-pkg/acquire.cc:825
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li"
 -msgstr "Leyendo Listado de Archivos"
 +msgstr "Descargando fichero %li de %li"
  
  #: apt-pkg/acquire-worker.cc:113
  #, c-format
@@@ -2471,12 -2455,12 +2517,12 @@@ msgstr "El método %s no se inició corre
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr "Por favor, inserte el disco «%s» en la unidad «%s» y presione Intro"
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "El sistema de paquetes '%s' no está soportado"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado"
  
@@@ -2513,107 -2497,104 +2559,123 @@@ msgstr "No se entiende el pin tipo %s
  msgid "No priority (or zero) specified for pin"
  msgstr "No hay prioridad especificada para pin (o es cero)"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "La caché tiene una versión incompatible de sistema de versiones"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Ocurrió un error mientras se procesaba %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Ocurrió un error mientras se procesaba %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Ocurrió un error mientras se procesaba %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Ocurrió un error mientras se procesaba %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Ocurrió un error mientras se procesaba %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Ocurrió un error mientras se procesaba %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Ocurrió un error mientras se procesaba %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Ocurrió un error mientras se procesaba %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Ocurrió un error mientras se procesaba %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  "Vaya, excedió el número de nombres de paquetes que este APT es capaz de "
  "manejar."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "Vaya, excedió el número de versiones que este APT es capaz de manejar."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "Vaya, excedió el número de versiones que este APT es capaz de manejar."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  "Vaya, excedió el número de dependencias que este APT es capaz de manejar."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Ocurrió un error mientras procesaba %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Ocurrió un error mientras procesaba %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  "Al procesar las dependencias de archivos no se encontró el\n"
  "paquete %s %s"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "No se puede leer la lista de paquetes fuente %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Recogiendo archivos que proveen"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "Error de E/S guardando caché fuente"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "falló el cambio de nombre, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "La suma MD5 difiere"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr ""
 +"No existe ninguna clave pública disponible para los siguientes "
 +"identificadores de clave:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2623,7 -2604,7 +2685,7 @@@ msgstr "
  "que necesita arreglar manualmente este paquete (debido a que falta una "
  "arquitectura)"
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2632,7 -2613,7 +2694,7 @@@ msgstr "
  "No se pudo localizar un archivo para el paquete %s. Esto puede significar "
  "que necesita arreglar manualmente este paquete."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
@@@ -2640,7 -2621,7 +2702,7 @@@ msgstr "
  "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:1392
  msgid "Size mismatch"
  msgstr "El tamaño difiere"
  
@@@ -2649,7 -2630,7 +2711,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Bloque de fabricante %s sin huella digital"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2658,47 -2639,47 +2720,49 @@@ msgstr "
  "Usando el punto de montaje del CD-ROM %s\n"
  "Montando el CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Identificando.. "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Etiqueta guardada: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Usando el punto de montaje del CD-ROM %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Desmontando el CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Esperando el disco...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Montando el CD-ROM...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Buscando en el disco archivos de índices...\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "Se encontraron %i índices de paquetes, %i de fuentes y %i firmas\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Ese no es un nombre válido, inténtelo de nuevo.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2707,38 -2688,38 +2771,38 @@@ msgstr "
  "Este disco se llama: \n"
  "'%s'\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Copiando las listas de paquetes..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Escribiendo nueva lista de fuente\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Las entradas de la lista de fuentes para este disco son:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Desmontando CD-ROM..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "%i registros escritos.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "%i registros escritos con %i fichero de menos.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "%i registros escritos con %i fichero mal emparejado\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2785,24 -2766,39 +2849,32 @@@ msgid "Removed %s
  msgstr "%s eliminado"
  
  #: apt-pkg/deb/dpkgpm.cc:378
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing to completely remove %s"
 -msgstr "Preparándose para configurar %s"
 +msgstr "Preparándose para eliminar completamente %s"
  
  #: apt-pkg/deb/dpkgpm.cc:379
 -#, fuzzy, c-format
 +#, c-format
  msgid "Completely removed %s"
 -msgstr "No pude borrar %s"
 +msgstr "Se borró completamente %s"
 +
++#: methods/rred.cc:219
++msgid "Could not patch file"
++msgstr "No pude parchear el fichero"
+ 
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "La conexión se cerró prematuramente"
  
- #~ msgid "Could not patch file"
- #~ msgstr "No pude parchear el fichero"
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
++#: apt-pkg/acquire-item.cc:1097
++#, fuzzy
++msgid "There is no public key available for the following key IDs:\n"
+ msgstr ""
++"No existe ninguna clave pública disponible para los siguientes "
++"identificadores de clave:\n"
  
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr " %s no tiene entrada de predominio\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr " %s no tiene entrada de predominio\n"
 -
 -#: methods/rred.cc:219
 -#, fuzzy
 -msgid "Could not patch file"
 -msgstr "No pude abrir el fichero %s"
 +#~ msgid "File date has changed %s"
 +#~ msgstr "Cambió la fecha del archivo %s"
  
  #~ msgid "Reading file list"
  #~ msgstr "Leyendo Lista de Archivos"
diff --combined po/eu.po
index 71b35f636,73fb9b556..75d71c6ad
--- a/po/eu.po
+++ b/po/eu.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  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: 2006-09-12 11:18+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2006-09-27 13:59+0200\n"
  "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
  "Language-Team: librezale <librezale@librezale.org>\n"
@@@ -18,147 -18,147 +18,157 @@@
  "Plural-Forms: nplurals=2; plural=(n != 1)\n"
  "\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "%s paketeak (%s bertsioa) mendekotasun-arazo bat du:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Ezin da %s paketea lokalizatu"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Pakete Izenak Guztira : "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Pakete normalak:"
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Pakete birtual puruak:"
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Bakanako pakete birtualak: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Nahastutako pakete birtualak: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Falta direnak: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Bertsio Ezberdinak Guztira: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Bertsio Ezberdinak Guztira: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Dependentziak Guztira: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Guztira Bertsio/fitxategi erlazioak: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Guztira Bertsio/fitxategi erlazioak: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Guztira Saltzaile Mapatzea: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Guztira beteratutakokateak: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Guztira bertsio dependentzi lekua: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Guztira galdutako tokia:"
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Guztira erregitratutako lekua: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "%s pakete-fitxategia ez dago sinkronizatuta."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Zehazki eredu bat eman behar duzu."
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Ez da paketerik aurkitu"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Pakete Fitxatefiak:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  "Cachea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin "
  "pakete-fitxategi bati"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Pin duten Paketeak:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(ez da aurkitu)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Instalatuta: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(bat ere ez)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Hautagaia: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Paketearen pin-a:"
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Bertsio tabla:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
--#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s (%s %s) konpilatua: %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -233,8 -233,7 +243,8 @@@ msgstr "
  
  #: cmdline/apt-cdrom.cc:78
  msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
 -msgstr "Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan"
 +msgstr ""
 +"Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan"
  
  #: cmdline/apt-cdrom.cc:93
  msgid "Please insert a Disc in the drive and press enter"
@@@ -305,7 -304,7 +315,7 @@@ msgstr "
  "  -c=? Irakurri konfigurazio-fitxategi hau\n"
  "  -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "%s : ezin da idatzi"
@@@ -643,79 -642,79 +653,79 @@@ msgstr "Arazoa %s desestekatzean
  msgid "Failed to rename %s to %s"
  msgstr "Huts egin du %s izenaren ordez %s ipintzean"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "Y"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Adierazpen erregularren konpilazio-errorea - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "baina %s instalatuta dago"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "baina %s instalatzeko dago"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "baina ez da instalagarria"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "baina pakete birtuala da"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "baina ez dago instalatuta"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "baina ez da instalatuko"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " edo"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Ondorengo paketeak KENDUKO dira:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Ondorengo paketeak mantendu egin dira:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Ondorengo paketeak BERTSIO-BERRITUKO dira:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (arrazoia: %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -723,145 -722,145 +733,145 @@@ msgstr "
  "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n"
  "EZ ezazu horelakorik egin, ez badakizu ondo zertan ari zaren!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu bertsio-berrituta, %lu berriki instalatuta, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu berrinstalatuta, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu aurreko bertsiora itzulita, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu ez erabat instalatuta edo kenduta.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Mendekotasunak zuzentzen..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " : huts egin du."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Ezin dira mendekotasunak zuzendu"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Ezin da bertsio-berritzeko multzoa minimizatu"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Eginda"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu zuzentzeko."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "Egiaztapen abisua gainidazten.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Paketeak egiaztapen gabe instalatu [b/E]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Zenbait pakete ezin dira egiaztatu"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Arazoak daude, eta -y erabili da --force-yes gabe"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Barne errorea, ez da ordenatzeaz amaitu"
  
--#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Ezin da deskarga-direktorioa blokeatu"
  
--#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Ezin izan da iturburu-zerrenda irakurri."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  "Hau bitxia.. Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra "
  "berri emanez (ingelesez)"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Artxiboetako %sB/%sB eskuratu behar dira.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Artxiboetako %sB eskuratu behar dira.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "Deskonprimitu ondoren, %sB gehiago erabiliko dira diskoan.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Deskonprimitu ondoren, %sB libratuko dira diskoan.\n"
  
--#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Ezin da %s(e)n duzun leku librea atzeman."
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Ez daukazu nahikoa leku libre %s(e)n."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Bai, egin esandakoa!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -872,28 -871,28 +882,28 @@@ msgstr "
  "Jarratzeko, idatzi '%s' esaldia\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Abortatu."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Aurrera jarraitu nahi al duzu [B/e]? "
  
--#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Ezin da lortu %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Fitxategi batzuk ezin izan dira deskargatu"
  
--#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Deskarga amaituta eta deskarga soileko moduan"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -901,47 -900,47 +911,47 @@@ msgstr "
  "Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo "
  "--fix-missing aukerarekin saiatu?"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing eta euskarri-aldaketa ez dira onartzen oraingoz"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Falta diren paketeak ezin dira zuzendu."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Abortatu instalazioa."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "%s pakete birtual bat da, honek hornitua:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Instalatuta]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Zehazki bat hautatu behar duzu instalatzeko."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -952,49 -951,49 +962,49 @@@ msgstr "
  "egiten dio. Beharbada paketea faltako da, edo zaharkituta egongo da, edo \n"
  "beste iturburu batean bakarrik egongo da erabilgarri\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Baina ondorengo paketeek ordezten dute:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "%s paketeak ez du instalatzeko hautagairik"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s bertsiorik berriena da jada.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Ezin da zerrenda-direktorioa blokeatu"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1002,25 -1001,25 +1012,44 @@@ msgstr "
  "Indize-fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo "
  "zaharrak erabili dira haien ordez."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "Informazio honek arazoa konpontzen lagun dezake:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Ezin izan da %s paketea aurkitu"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1028,7 -1027,7 +1057,7 @@@ msgstr "
  "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
  "zehaztu konponbide bat)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1040,7 -1039,7 +1069,7 @@@ msgstr "
  "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
  "Sarrerakoetan (Incoming) egoten jarraituko dute."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1049,129 -1048,126 +1078,125 @@@ msgstr "
  "Eragiketa soil bat eskatu duzunez, seguru asko paketea ez da instalagarria\n"
  "izango, eta pakete horren errorearen berri ematea komeni da."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "Informazio honek arazoa konpontzen lagun dezake:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Hautsitako paketeak"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
  
--#: cmdline/apt-get.cc:1692
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Iradokitako paketeak:"
  
--#: cmdline/apt-get.cc:1693
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Gomendatutako paketeak:"
  
--#: cmdline/apt-get.cc:1713
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Berriketak kalkulatzen... "
  
--#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Huts egin du"
  
--#: cmdline/apt-get.cc:1721
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Eginda"
  
--#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
  
--#: cmdline/apt-get.cc:1894
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
  
--#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Ezin da iturburu-paketerik aurkitu %s(r)entzat"
  
--#: cmdline/apt-get.cc:1968
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
  
--#: cmdline/apt-get.cc:1992
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Ez daukazu nahikoa leku libre %s(e)n."
  
--#: cmdline/apt-get.cc:1997
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Iturburu-artxiboetako %sB/%sB eskuratu behar dira.\n"
  
--#: cmdline/apt-get.cc:2000
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n"
  
--#: cmdline/apt-get.cc:2006
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Eskuratu %s iturubura\n"
  
--#: cmdline/apt-get.cc:2037
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Huts egin du zenbat artxibo lortzean."
  
--#: cmdline/apt-get.cc:2065
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
 -msgstr "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
 +msgstr ""
 +"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
  
--#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
  
--#: cmdline/apt-get.cc:2078
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Egiaztattu 'dpkg-dev' paketea instalaturik dagoen.\n"
  
--#: cmdline/apt-get.cc:2095
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
  
--#: cmdline/apt-get.cc:2114
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Prozesu umeak huts egin du"
  
--#: cmdline/apt-get.cc:2130
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
 -msgstr "Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko"
 +msgstr ""
 +"Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko"
  
--#: cmdline/apt-get.cc:2158
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Ezin izan da %s(r)en eraikitze-mendekotasunen informazioa eskuratu"
  
--#: cmdline/apt-get.cc:2178
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s: ez du eraikitze-mendekotasunik.\n"
  
--#: cmdline/apt-get.cc:2230
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
 -msgstr "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 +msgstr ""
 +"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
  
--#: cmdline/apt-get.cc:2282
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1180,32 -1176,32 +1205,32 @@@ msgstr "
  "%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak "
  "betetzen dituen %3$s paketearen bertsio erabilgarririk"
  
--#: cmdline/apt-get.cc:2317
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s "
  "paketea berriegia da"
  
--#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s"
  
--#: cmdline/apt-get.cc:2356
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "%s(r)en eraikitze-mendekotasunak ezin izan dira bete."
  
--#: cmdline/apt-get.cc:2360
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean"
  
--#: cmdline/apt-get.cc:2392
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Onartutako Moduluak:"
  
--#: cmdline/apt-get.cc:2433
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1372,8 -1368,7 +1397,8 @@@ msgid "or errors caused by missing depe
  msgstr "edo falta diren mendekotasunen erroreak. Hori ondo dago; mezu honen"
  
  #: dselect/install:103
 -msgid "above this message are important. Please fix them and run [I]nstall again"
 +msgid ""
 +"above this message are important. Please fix them and run [I]nstall again"
  msgstr ""
  "aurreko erroreak dira garrantzitsuak. Konpondu eta exekutatu [I]nstall "
  "berriro"
@@@ -1543,9 -1538,9 +1568,9 @@@ msgid "The info and temp directories ne
  msgstr "info eta temp direktorioek fitxategi-sistema berean egon behar dute"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Pakete Zerrenda irakurtzen"
  
@@@ -1629,8 -1624,7 +1654,8 @@@ msgstr "Ez da baliozko DEB artxiboa; '%
  #: apt-inst/deb/debfile.cc:52
  #, c-format
  msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
 -msgstr "Hau ez da balioz DEB fitxategi bat, ez du ez  '%s' ez '%s' atalik falta du"
 +msgstr ""
 +"Hau ez da balioz DEB fitxategi bat, ez du ez  '%s' ez '%s' atalik falta du"
  
  #: apt-inst/deb/debfile.cc:112
  #, c-format
@@@ -1669,8 -1663,7 +1694,8 @@@ msgstr "CD okerra
  #: methods/cdrom.cc:164
  #, c-format
  msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 -msgstr "Ezin izan da %s(e)ko CD-ROMa desmuntatu; beharbada erabiltzen ariko da."
 +msgstr ""
 +"Ezin izan da %s(e)ko CD-ROMa desmuntatu; beharbada erabiltzen ariko da."
  
  #: methods/cdrom.cc:169
  msgid "Disk not found."
@@@ -1680,12 -1673,12 +1705,14 @@@ msgstr "Ez da diska aurkitu
  msgid "File not found"
  msgstr "Ez da fitxategia aurkitu"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:134
 -#: methods/gzip.cc:143
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Huts egin du atzitzean"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:140
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Huts egin du aldaketa-ordua ezartzean"
  
@@@ -1771,8 -1764,7 +1798,8 @@@ msgstr "Ezin izan da socket-a sortu
  
  #: methods/ftp.cc:698
  msgid "Could not connect data socket, connection timed out"
 -msgstr "Ezin izan da datu-socketa konektatu; konexioak denbora-muga gainditu du"
 +msgstr ""
 +"Ezin izan da datu-socketa konektatu; konexioak denbora-muga gainditu du"
  
  #: methods/ftp.cc:704
  msgid "Could not connect passive socket."
@@@ -1816,7 -1808,7 +1843,7 @@@ msgstr "Datu-socket konexioak denbora-m
  msgid "Unable to accept connection"
  msgstr "Ezin da konexioa onartu"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Arazoa fitxategiaren hash egitean"
  
@@@ -1866,8 -1858,7 +1893,8 @@@ msgstr "Ezin izan da konexioa hasi -> %
  #: methods/connect.cc:93
  #, c-format
  msgid "Could not connect to %s:%s (%s), connection timed out"
 -msgstr "Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du"
 +msgstr ""
 +"Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du"
  
  #: methods/connect.cc:108
  #, c-format
@@@ -1911,8 -1902,7 +1938,8 @@@ msgid "E: Argument list from Acquire::g
  msgstr "E: Acquire::gpgv::Options arguimentu zerrenda luzeegia. Uzten."
  
  #: methods/gpgv.cc:204
 -msgid "Internal error: Good signature, but could not determine key fingerprint?!"
 +msgid ""
 +"Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu"
  
  #: methods/gpgv.cc:209
@@@ -1922,8 -1912,7 +1949,8 @@@ msgstr "Beintza sinadura baliogabe bat 
  #: methods/gpgv.cc:213
  #, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 -msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gnupg instalaturik al dago?)"
 +msgstr ""
 +"Ezin da %s abiarazi sinadura egiaztatzeko (gnupg instalaturik al dago?)"
  
  #: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
@@@ -1941,86 -1930,86 +1968,86 @@@ msgstr "
  "Ondorengo sinadurak ezin dira egiaztatu gako publikoa ez bait dago "
  "eskuragarri:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Irakurri errorea %s prozesutik"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Goiburuen zain"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Okerreko goiburu-lerroa"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "http zerbitzariak erantzun-buru baliogabe bat bidali du."
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "http zerbitzariak barruti onarpena apurturik du"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Datu-formatu ezezaguna"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Hautapenak huts egin du"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Konexioaren denbora-muga gainditu da"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Errorea irteerako fitxategian idaztean"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Errorea fitxategian idaztean"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Errorea fitxategian idaztean"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Errorea zerbitzaritik irakurtzean"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Goiburu data gaizki dago"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Konexioak huts egin du"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Barne-errorea"
  
@@@ -2033,7 -2022,7 +2060,7 @@@ msgstr "Ezin da fitxategi huts baten mm
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Ezin izan da %lu byteren mmap egin"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "%s hautapena ez da aurkitu"
@@@ -2093,12 -2082,12 +2120,12 @@@ msgstr "Sintaxi-errorea, %s:%u: onartu 
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Sintaxi-errorea, %s:%u: Zabor gehigarria fitxategi-amaieran"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Errorea!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Eginda"
@@@ -2127,8 -2116,7 +2154,8 @@@ msgstr "%s aukerak argumentu bat behar 
  #: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
  #, c-format
  msgid "Option %s: Configuration item specification must have an =<val>."
 -msgstr "%s aukera: konfigurazio-elementuaren zehaztapenak =<val> eduki behar du."
 +msgstr ""
 +"%s aukera: konfigurazio-elementuaren zehaztapenak =<val> eduki behar du."
  
  #: apt-pkg/contrib/cmndline.cc:237
  #, c-format
@@@ -2179,8 -2167,7 +2206,8 @@@ msgstr "Ezin izan da %s blokeo-fitxateg
  #: apt-pkg/contrib/fileutl.cc:105
  #, c-format
  msgid "Not using locking for nfs mounted lock file %s"
 -msgstr "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat"
 +msgstr ""
 +"Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat"
  
  #: apt-pkg/contrib/fileutl.cc:109
  #, c-format
@@@ -2234,93 -2221,93 +2261,110 @@@ msgstr "Arazoa fitxategia desestekatzea
  msgid "Problem syncing the file"
  msgstr "Arazoa fitxategia sinkronizatzean"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Paketeen cachea hutsik"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Paketeen cache-fitxategia hondatuta dago"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Paketeen cache-fitxategiaren bertsioa ez da bateragarria"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "APT honek ez du '%s' bertsio sistema onartzen"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "Paketeen cachea beste arkitektura batentzat sortuta dago"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Mendekotasuna:"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Aurremendekotasuna:"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Iradokizuna:"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Gomendioa:"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Gatazka:"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Ordeztea:"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Zaharkitzea:"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "garrantzitsua"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "beharrezkoa"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "estandarra"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "aukerakoa"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "estra"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Dependentzia zuhaitza eraikitzen"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Hautagaien bertsioak"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Dependentzi Sormena"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Eskuragarrien datuak biltzen"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Huts egin du %s irekitzean"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Ezin izan da %s fitxategian idatzi"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Ezin da %s pakete-fitxategia analizatu (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:186
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Ezin da %s pakete-fitxategia analizatu (2)"
@@@ -2355,7 -2342,7 +2399,7 @@@ msgstr "Gaizki osatutako %lu lerroa %s 
  msgid "Opening %s"
  msgstr "%s irekitzen"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "%2$s iturburu-zerrendako %1$u lerroa luzeegia da."
@@@ -2392,14 -2379,12 +2436,14 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "'%s' motako indize-fitxategirik ez da onartzen"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
 -msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
 -msgstr "%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
 +msgid ""
 +"The package %s needs to be reinstalled, but I can't find an archive for it."
 +msgstr ""
 +"%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2407,7 -2392,7 +2451,7 @@@ msgstr "
  "Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada "
  "atxikitako paketeek eraginda."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu."
  
@@@ -2448,12 -2433,12 +2492,12 @@@ msgstr "%s metodoa ez da behar bezala a
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu"
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "'%s' pakete-sistema ez da onartzen"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Ezin da pakete-sistemaren mota egokirik zehaztu"
  
@@@ -2487,100 -2472,99 +2531,116 @@@ msgstr "Ez da ulertu %s orratz-mota (pi
  msgid "No priority (or zero) specified for pin"
  msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Cachearen bertsio-sistema ez da bateragarria"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Errorea gertatu da %s prozesatzean (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Errorea gertatu da %s prozesatzean (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Errorea gertatu da %s prozesatzean (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Errorea gertatu da %s prozesatzean (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Errorea gertatu da %s prozesatzean (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Errorea gertatu da %s prozesatzean (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr "APT honek maneia dezakeen pakete-izenen kopurua gainditu duzu."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "APT honek maneia dezakeen bertsio-kopurua gainditu duzu."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "APT honek maneia dezakeen bertsio-kopurua gainditu duzu."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr "APT honek maneia dezakeen mendekotasun-kopurua gainditu duzu."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Errorea gertatu da %s prozesatzean (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "%s %s paketea ez da aurkitu fitxategi-mendekotasunak prozesatzean"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Ezin da atzitu %s iturburu-paketeen zerrenda"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Fitxategi-erreferentziak biltzen"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "S/I errorea iturburu-cachea gordetzean"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "MD5Sum ez dator bat"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr "Hurrengo gako ID hauentzat ez dago gako publiko eskuragarririk:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2589,7 -2573,7 +2649,7 @@@ msgstr "
  "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
  "beharko duzu paketea. (arkitektura falta delako)"
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2598,15 -2582,14 +2658,15 @@@ msgstr "
  "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
  "beharko duzu paketea."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
 -msgid "The package index files are corrupted. No Filename: field for package %s."
 +msgid ""
 +"The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  "Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
  "paketearentzat."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Tamaina ez dator bat"
  
@@@ -2615,7 -2598,7 +2675,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "%s saltzaile blokeak ez du egiaztapen markarik"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2624,47 -2607,47 +2684,49 @@@ msgstr "
  "%s CD-ROM muntatze puntua erabiltzen\n"
  "CD-ROM-a muntatzen\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Egiaztatzen... "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Gordetako Etiketa: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "%s CD-ROM muntatze puntua erabiltzen\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "CD-ROM-a desmuntatzen\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Diska itxaroten...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "CD-ROM-a muntatzen...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Indize fitxategien bila diska arakatzen...\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "%i pakete indize, %i jatorri indize eta %i sinadura aurkitu dira\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Hau ez baliozko izen bat, froga berriro.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2673,42 -2656,41 +2735,42 @@@ msgstr "
  "Diskaren izen:\n"
  "'%s'\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Pakete zerrendak kopiatzen..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "jatorri zerrenda berria idazten\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Diskarentzako jaotrri sarrerak:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "CD-ROM Desmuntatzen..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "%i erregistro grabaturik.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "%i erregistro eta %i okerreko fitxategi grabaturik.\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 -msgstr "%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n"
 +msgstr ""
 +"%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n"
  
  #: apt-pkg/deb/dpkgpm.cc:358
  #, c-format
@@@ -2760,6 -2742,7 +2822,16 @@@ msgstr "%s guztiz ezabatzeko prestatzen
  msgid "Completely removed %s"
  msgstr "%s guztiz ezabatu da"
  
++#: methods/rred.cc:219
++#, fuzzy
++msgid "Could not patch file"
++msgstr "%s fitxategia ezin izan da ireki"
++
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Konexioa behar baino lehenago itxi da"
+ 
++#: apt-pkg/acquire-item.cc:1097
++#, fuzzy
++msgid "There is no public key available for the following key IDs:\n"
++msgstr "Hurrengo gako ID hauentzat ez dago gako publiko eskuragarririk:\n"
diff --combined po/fi.po
index 0c4d90b83,81428c8c9..14dad03f1
--- a/po/fi.po
+++ b/po/fi.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  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: 2006-09-12 11:18+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2006-09-29 16:06+0300\n"
  "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
  "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@@ -17,145 -17,145 +17,155 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Paketin %s versiossa %s on tyydyttämätön riippuvuus:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Pakettia %s ei löydy"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Pakettien kokonaismäärä : "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Tavallisia paketteja: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Aitoja näennäispaketteja: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Yksinkertaisia näennäispaketteja: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Sekanäennäispaketteja: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Puuttuu: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Eri versioita yhteensä: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Eri versioita yhteensä: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Riippuvuuksia yhteensä: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Versio/tdsto suhteita yht: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Versio/tdsto suhteita yht: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Tarjoamiskuvauksia yhteensä: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Erilaisia merkkijonoja yhteensä: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Versioriippuvuustila yhteensä: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Löysää tilaa yhteensä: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Käytetty tila yhteensä: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Pakettitiedosto %s ei ole ajan tasalla."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "On annettava täsmälleen yksi lauseke"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Yhtään pakettia ei löytynyt"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Pakettitiedostot:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "Varasto ei ole ajan tasalla, pakettitiedostoa ei löydy kansiosta"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Paketit joissa tunniste:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(ei löydy)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Asennettu: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(ei mitään)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Ehdokas: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Paketin tunnistenumero: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Versiotaulukko:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
--#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s laitealustalle %s %s käännöksen päiväys %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -301,7 -301,7 +311,7 @@@ msgstr "
  "  -c=? Lue tämä asetustiedosto\n"
  "  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
@@@ -440,9 -440,7 +450,9 @@@ msgstr "Tietokanta on vanha, yritetää
  msgid ""
  "DB format is invalid. If you upgraded from a older version of apt, please "
  "remove and re-create the database."
 -msgstr "Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, on tietokanta poistettava ja luotava uudelleen."
 +msgstr ""
 +"Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, "
 +"on tietokanta poistettava ja luotava uudelleen."
  
  #: ftparchive/cachedb.cc:81
  #, c-format
@@@ -643,79 -641,79 +653,79 @@@ msgstr "Ilmeni pulmia poistettaessa tie
  msgid "Failed to rename %s to %s"
  msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "K"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Käännösvirhe lausekkeessa - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "mutta %s on asennettu"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "mutta %s on merkitty asennettavaksi"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "mutta ei ole asennuskelpoinen"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "mutta on näennäispaketti"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "mutta ei ole asennettu"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "mutta ei ole merkitty asennettavaksi"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " tai"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Seuraavat UUDET paketit asennetaan:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Seuraavat paketit POISTETAAN:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Nämä paketit on jätetty odottamaan:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Nämä paketit päivitetään:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Nämä paketit VARHENNETAAN:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Seuraavat pysytetyt paketit muutetaan:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (syynä %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -723,145 -721,145 +733,145 @@@ msgstr "
  "VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n"
  "Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu päivitetty, %lu uutta asennusta, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu uudelleen asennettua, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu varhennettua, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Korjataan riippuvuuksia..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " ei onnistunut."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Riippuvuuksien korjaus ei onnistu"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Päivitysjoukon minimointi ei onnistu"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Valmis"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "Varoitus varmistamisesta on ohitettu.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Asennetaanko nämä paketit ilman todennusta [y/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi"
  
--#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Noutokansiota ei saatu lukittua"
  
--#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  "No jo on... Koot eivät täsmää, sähköpostita email apt@packages.debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Noudettavaa arkistoa %st/%st.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Noudettavaa arkistoa %st.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "Purkamisen jälkeen käytetään %st lisää levytilaa.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Purkamisen jälkeen vapautuu %st levytilaa.\n"
  
--#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  "On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Kyllä, tee kuten käsketään!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -872,28 -870,28 +882,28 @@@ msgstr "
  "Jatka kirjoittamalla \"%s\"\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Keskeytä."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Haluatko jatkaa [K/e]? "
  
--#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Tiedoston %s nouto ei onnistunut  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Joidenkin tiedostojen nouto ei onnistunut"
  
--#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Nouto on valmis ja määrätty vain nouto"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -901,47 -899,47 +911,47 @@@ msgstr "
  "Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\" auttaa tai "
  "kokeile --fix-missing?"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Puuttuvia paketteja ei voi korjata."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Asennus keskeytetään."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Huomautus, valitaan %s eikä %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Paketti %s on näennäispaketti, jonka kattaa:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Asennettu]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Yksi pitää valita asennettavaksi."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -952,49 -950,49 +962,49 @@@ msgstr "
  "Tämä voi tarkoittaa paketin puuttuvan, olevan vanhentunut tai\n"
  "saatavilla vain jostain muusta lähteestä\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Seuraavat paketit kuitenkin korvaavat sen:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Paketilla %s ei ole asennettavaa valintaa"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s on jo uusin versio.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Valittiin versio %s (%s) paketille %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "Komento update ei käytä parametreja"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Luettelokansiota ei voitu lukita"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1002,25 -1000,25 +1012,44 @@@ msgstr "
  "Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai "
  "käytetty vanhoja. "
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Sisäinen virhe, resolver rikkoi jotain"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Pakettia %s ei löytynyt"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1028,7 -1026,7 +1057,7 @@@ msgstr "
  "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
  "ilmanpaketteja (tai ratkaise itse)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1039,7 -1037,7 +1068,7 @@@ msgstr "
  "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n"
  "vielä luotu tai siirretty Incoming-kansiosta."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1049,120 -1047,120 +1078,116 @@@ msgstr "
  "paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n"
  "tuosta paketista."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Rikkinäiset paketit"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
  
--#: cmdline/apt-get.cc:1692
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Ehdotetut paketit:"
  
--#: cmdline/apt-get.cc:1693
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Suositellut paketit:"
  
--#: cmdline/apt-get.cc:1713
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Käsitellään päivitystä ... "
  
--#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Ei onnistunut"
  
--#: cmdline/apt-get.cc:1721
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Valmis"
  
--#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Sisäinen virhe, resolver rikkoi jotain"
  
--#: cmdline/apt-get.cc:1894
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
  
--#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
  
--#: cmdline/apt-get.cc:1968
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
  
--#: cmdline/apt-get.cc:1992
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa"
  
--#: cmdline/apt-get.cc:1997
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
  
--#: cmdline/apt-get.cc:2000
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "On noudettava %st lähdekoodiarkistoja.\n"
  
--#: cmdline/apt-get.cc:2006
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Nouda lähdekoodi %s\n"
  
--#: cmdline/apt-get.cc:2037
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
  
--#: cmdline/apt-get.cc:2065
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
  
--#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Purkukomento \"%s\" ei onnistunut.\n"
  
--#: cmdline/apt-get.cc:2078
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
  
--#: cmdline/apt-get.cc:2095
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
  
--#: cmdline/apt-get.cc:2114
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Lapsiprosessi kaatui"
  
--#: cmdline/apt-get.cc:2130
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
  
--#: cmdline/apt-get.cc:2158
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
  
--#: cmdline/apt-get.cc:2178
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
  
--#: cmdline/apt-get.cc:2230
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1170,7 -1168,7 +1195,7 @@@
  msgstr ""
  "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
  
--#: cmdline/apt-get.cc:2282
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1179,32 -1177,32 +1204,32 @@@ msgstr "
  "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
  "ei vastaa versioriippuvuuksia"
  
--#: cmdline/apt-get.cc:2317
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian "
  "uusi"
  
--#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
  
--#: cmdline/apt-get.cc:2356
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
  
--#: cmdline/apt-get.cc:2360
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
  
--#: cmdline/apt-get.cc:2392
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Tuetut moduulit:"
  
--#: cmdline/apt-get.cc:2433
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1542,9 -1540,9 +1567,9 @@@ msgid "The info and temp directories ne
  msgstr "Kansioiden info ja temp pitää olla samassa tiedostojärjestelmässä"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Luetaan pakettiluetteloita"
  
@@@ -1677,12 -1675,12 +1702,14 @@@ msgstr "Levyä ei löydy
  msgid "File not found"
  msgstr "Tiedostoa ei löydy"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:134
 -#: methods/gzip.cc:143
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Komento stat ei toiminut"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:140
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua"
  
@@@ -1810,7 -1808,7 +1837,7 @@@ msgstr "Pistokkeen kytkeminen aikakatka
  msgid "Unable to accept connection"
  msgstr "Yhteyttä ei voitu hyväksyä"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Pulmia tiedoston hajautuksessa"
  
@@@ -1936,86 -1934,86 +1963,86 @@@ msgstr "
  "Seuraavia allekirjoituksia ei voinut varmentaa koska julkista avainta ei ole "
  "saatavilla:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Putkea %s ei voitu avata"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Prosessi %s ilmoitti lukuvirheestä"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Odotetaan otsikoita"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Virheellinen otsikkorivi"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "HTTP-palvelimen arvoaluetuki on rikki"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Tuntematon päiväysmuoto"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Select ei toiminut"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Yhteys aikakatkaistiin"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Tapahtui virhe luettaessa palvelimelta"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Virheellinen otsikkotieto"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Yhteys ei toiminut"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Sisäinen virhe"
  
@@@ -2028,7 -2026,7 +2055,7 @@@ msgstr "Tyhjälle tiedostolle ei voi te
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Ei voitu tehdä %lu tavun mmap:ia"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Valintaa %s ei löydy"
@@@ -2088,12 -2086,12 +2115,12 @@@ msgstr "Syntaksivirhe %s: %u: Tätä di
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Virhe!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Valmis"
@@@ -2225,93 -2223,93 +2252,110 @@@ msgstr "Pulmia tehtäessä tiedostolle 
  msgid "Problem syncing the file"
  msgstr "Pulmia tehtäessä tiedostolle sync"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Pakettivarasto on tyhjä"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Pakettivarasto on turmeltunut"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Pakettivaraston versio on yhteensopimaton"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Tämä APT ei tue versionhallintajärjestelmää \"%s\""
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "Pakettivarasto on tehty muulle arkkitehtuurille"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Riippuvuudet"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Esiriippuvuudet"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Ehdotukset"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Suosittelut"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Ristiriidat"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Korvaavuudet"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Täydet korvaavuudet"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "tärkeä"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "välttämätön"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "perus"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "valinnainen"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "ylimääräinen"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Muodostetaan riippuvuussuhteiden puu"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Mahdolliset versiot"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Luodaan riippuvuudet"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Yhdistetään saatavuustiedot"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Tiedoston %s avaaminen ei onnistunut"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Tiedoston %s kirjoittaminen ei onnistunut"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:186
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
@@@ -2346,7 -2344,7 +2390,7 @@@ msgstr "Väärän muotoinen rivi %lu lÃ
  msgid "Opening %s"
  msgstr "Avataan %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Rivi %u on liian pitkä lähdeluettelossa %s."
@@@ -2382,13 -2380,13 +2426,13 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei löydy."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2396,7 -2394,7 +2440,7 @@@ msgstr "
  "Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt "
  "paketit."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty."
  
@@@ -2437,12 -2435,12 +2481,12 @@@ msgstr "Menetelmä %s ei käynnistynyt 
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr "Pistä levy nimeltään: \"%s\" asemaan \"%s\" ja paina Enter."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä"
  
@@@ -2477,101 -2475,100 +2521,117 @@@ msgstr "Tunnistetyyppi %s on tuntematon
  msgid "No priority (or zero) specified for pin"
  msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Tapahtui virhe käsiteltäessä %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  "Jummijammi, annoit enemmän pakettien nimiä kuin tämä APT osaa käsitellä."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "Jummijammi, annoit enemmän versioita kuin tämä APT osaa käsitellä."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "Jummijammi, annoit enemmän versioita kuin tämä APT osaa käsitellä."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr "Jummijammi, annoit enemmän riippuvuuksia kuin tämä APT osaa käsitellä."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Tapahtui virhe käsiteltäessä %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "Pakettia %s %s ei löytynyt käsiteltäessä tiedostojen riippuvuuksia."
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "stat ei toiminut lähdepakettiluettelolle %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Kootaan tiedostojen tarjoamistietoja"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "MD5Sum ei täsmää"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are 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:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2580,7 -2577,7 +2640,7 @@@ msgstr "
  "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan "
  "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)"
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2589,7 -2586,7 +2649,7 @@@ msgstr "
  "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
  "tämän paketin itse."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
@@@ -2597,7 -2594,7 +2657,7 @@@ msgstr "
  "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
  "kenttää."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Koko ei täsmää"
  
@@@ -2606,7 -2603,7 +2666,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Toimittajan lohkosta %s puuttuu sormenjälki"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2615,49 -2612,49 +2675,51 @@@ msgstr "
  "Käytetään rompun liitoskohtaa %s\n"
  "Liitetään romppu\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Tunnistetaan... "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Tallennettu nimio: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Käytetään rompun liitoskohtaa %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Irrotetaan romppu\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Odotetaan levyä...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Liitetään romppu...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Etsitään levyltä hakemistotiedostoja...\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr ""
  "Asennuspakettien hakemistoja löytyi %i, lähdekoodipakettien hakemistoja %i "
  "ja allekirjoituksia %i\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Tuo ei kelpaa nimeksi, yritä uudelleen.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2666,38 -2663,38 +2728,38 @@@ msgstr "
  "Tämä levy on: \n"
  "\"%s\"\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Kopioidaan pakettiluetteloita..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Kirjoitetaan uusi lähdeluettelo\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Irrotetaan romppu..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Kirjoitettiin %i tietuetta.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2754,17 -2751,17 +2816,23 @@@ msgstr "Valmistaudutaan poistamaan %s k
  msgid "Completely removed %s"
  msgstr "%s poistettiin kokonaan"
  
++#: methods/rred.cc:219
++#, fuzzy
++msgid "Could not patch file"
++msgstr "Tiedostoa %s ei voitu avata"
++
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Yhteys katkesi ennenaikaisesti"
  
++#: apt-pkg/acquire-item.cc:1097
++#, fuzzy
++msgid "There is no public key available for the following key IDs:\n"
++msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n"
++
  #~ msgid "File date has changed %s"
  #~ msgstr "Tiedoston uusi päiväys %s"
  
--#, fuzzy
--#~ msgid "Could not patch file"
--#~ msgstr "Tiedostoa %s ei voitu avata"
--
  #~ msgid "Reading file list"
  #~ msgstr "Luetaan tiedostoluetteloa"
  
diff --combined po/fr.po
index 2c046f1d1,e74322325..8e75af443
--- a/po/fr.po
+++ b/po/fr.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: fr\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-05-27 13:46+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2006-09-02 09:59+0200\n"
  "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
  "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@@ -18,145 -18,145 +18,155 @@@
  "X-Generator: KBabel 1.11.4\n"
  "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Le paquet %s de version %s contient une dépendance absente :\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Impossible de trouver le paquet %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Nombre total de paquets : "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Paquets ordinaires : "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Paquets entièrement virtuels : "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Paquets virtuels simples : "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Paquets virtuels mixtes : "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Manquants : "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Nombre de versions distinctes : "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Nombre de versions distinctes : "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Nombre de dépendances : "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Nombre de relations version/fichier : "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Nombre de relations version/fichier : "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Nombre de relations « Provides » : "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Nombre de motifs rationnels : "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Espace occupé par les versions des dépendances : "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Espace disque gaspillé : "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Total de l'espace attribué : "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Fichier %s désynchronisé."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Vous devez fournir exactement un motif"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Aucun paquet n'a été trouvé"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Fichiers du paquet :"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "Le cache est désynchronisé, impossible de référencer un fichier"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Paquets étiquetés :"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(non trouvé)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Installé : "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(aucun)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Candidat : "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Étiquette de paquet : "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr " Table de version :"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s pour %s %s est compilé le %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -235,13 -235,11 +245,13 @@@ msgstr "
  
  #: 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."
@@@ -310,15 -308,14 +320,15 @@@ msgstr "
  "   -c=? Lit ce fichier de configuration\n"
  "   -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Impossible d'écrire sur %s"
  
  #: cmdline/apt-extracttemplates.cc:310
  msgid "Cannot get debconf version. Is debconf installed?"
 -msgstr "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
 +msgstr ""
 +"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
  
  #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
  msgid "Package extension list is too long"
@@@ -434,131 -431,117 +444,131 @@@ msgstr "Aucune sélection ne correspond
  #: ftparchive/apt-ftparchive.cc:835
  #, c-format
  msgid "Some files are missing in the package file group `%s'"
 -msgstr "Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »"
 +msgstr ""
 +"Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "Base de données corrompue, fichier renommé en %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "Base de données ancienne, tentative de mise à jour de %s\""
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +"Le format de la base de données n'est pas valable. Si vous mettez APT à "
 +"jour, veuillez supprimer puis recréer la base de données."
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "Impossible d'ouvrir le fichier de base de données %s : %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "La date du fichier a changé %s"
 +msgid "Failed to stat %s"
 +msgstr "Impossible de statuer %s"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "L'archive n'a pas d'enregistrement de contrôle"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "Impossible d'obtenir un curseur"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "A : Impossible de lire le contenu du répertoire %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "A : Impossible de statuer %s\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "E : "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "A : "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "E : des erreurs sont survenues sur le fichier "
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "Impossible de résoudre %s"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "Échec du parcours de l'arbre"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "Impossible d'ouvrir %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr " Délier %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "Impossible de lire le lien %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "Impossible de délier %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** Impossible de lier %s à %s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " Seuil de delink de %so atteint.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "Impossible de statuer %s"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "L'archive ne possède pas de champ de paquet"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr "%s ne possède pas d'entrée « override »\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr " le responsable de %s est %s et non %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr "  %s ne possède pas d'entrée « source override »\n"
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr "  %s ne possède pas également pas d'entrée « binary override »\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -654,79 -637,79 +664,79 @@@ msgstr "Problème en déliant %s
  msgid "Failed to rename %s to %s"
  msgstr "Impossible de changer le nom %s en %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "O"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Erreur de compilation de l'expression rationnelle - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "mais %s est installé"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "mais %s devra être installé"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "mais il n'est pas installable"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "mais c'est un paquet virtuel"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "mais il n'est pas installé"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "mais ne sera pas installé"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " ou"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Les NOUVEAUX paquets suivants seront installés :"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Les paquets suivants seront ENLEVÉS :"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Les paquets suivants ont été conservés :"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Les paquets suivants seront mis à jour :"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Les paquets retenus suivants seront changés :"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (en raison de %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -735,139 -718,137 +745,139 @@@ msgstr "
  "Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n"
  "que vous êtes en train de faire."
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu mis à jour, %lu nouvellement installés, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu réinstallés, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu remis à une version inférieure, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu à enlever et %lu non mis à jour.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu partiellement installés ou enlevés.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Correction des dépendances..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " a échoué."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Impossible de corriger les dépendances"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Impossible de minimiser le nombre des paquets mis à jour"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Fait"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés."
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "Avertissement d'authentification ignoré.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Faut-il installer ces paquets sans vérification (o/N) ? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Certains paquets n'ont pas pu être authentifiés"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Il y a des problèmes et -y a été employé sans --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés."
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  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
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Erreur interne. Le tri a été interrompu."
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Impossible de verrouiller le répertoire de téléchargement"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "La liste des sources ne peut être lue."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  "Étrangement, les tailles ne correspondent pas. Veuillez le signaler par "
  "courriel à apt@packages.debian.org."
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Il est nécessaire de prendre %so/%so dans les archives.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Il est nécessaire de prendre %so dans les archives.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
 -msgstr "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
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Après dépaquetage, %so d'espace disque seront libérés.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Impossible de déterminer l'espace disponible sur %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Pas assez d'espace disponible sur %s"
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  "L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération "
@@@ -875,11 -856,11 +885,11 @@@
  
  # The space before the exclamation mark must not be a non-breaking space; this
  # sentence is supposed to be typed by a user who cannot see the difference.
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Oui, faites ce que je vous dis !"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -890,28 -871,28 +900,28 @@@ msgstr "
  "Pour continuer, tapez la phrase « %s »\n"
  " ?]"
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Annulation."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Souhaitez-vous continuer [O/n] ? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Impossible de récupérer %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Certains fichiers n'ont pu être téléchargés."
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Téléchargement achevé et dans le mode téléchargement uniquement"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -919,48 -900,47 +929,48 @@@ msgstr "
  "Impossible de récupérer quelques archives, peut-être devrez-vous lancer apt-"
  "get update ou essayer avec --fix-missing ?"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
 -msgstr "l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
 +msgstr ""
 +"l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Impossible de corriger le fait que les paquets manquent."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Annulation de l'installation."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Note, sélection de %s au lieu de %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Le paquet %s n'est pas installé, et ne peut donc être supprimé\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Le paquet %s est un paquet virtuel fourni par :\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Installé]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Vous devez explicitement sélectionner un paquet à installer."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -972,50 -952,49 +982,50 @@@ msgstr "
  "devenu obsolète\n"
  "ou qu'il n'est disponible que sur une autre source\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Cependant les paquets suivants le remplacent :"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Aucun paquet ne correspond au paquet %s"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, 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
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s est déjà la plus récente version disponible.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "La version  « %s » de « %s » est introuvable"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "La version « %s » de « %s » n'a pu être trouvée"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Version choisie %s (%s) pour %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "La commande de mise à jour ne prend pas d'argument"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Impossible de verrouiller le répertoire de liste"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1023,26 -1002,25 +1033,47 @@@ msgstr "
  "Le téléchargement de quelques fichiers d'index a échoué, ils ont été "
  "ignorés, ou les anciens ont été utilisés à la place."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "L'information suivante devrait vous aider à résoudre la situation : "
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr ""
++"Erreur interne, la tentative de résolution du problème a cassé certaines "
++"parties"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Impossible de trouver le paquet %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Note, sélectionne %s pour l'expression rationnelle « %s »\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  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
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1050,7 -1028,7 +1081,7 @@@ msgstr "
  "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n"
  "(ou indiquez une solution)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1062,7 -1040,7 +1093,7 @@@ msgstr "
  "la distribution unstable, que certains paquets n'ont pas encore\n"
  "été créés ou ne sont pas sortis d'Incoming."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1071,123 -1049,123 +1102,119 @@@ msgstr "
  "Puisque vous n'avez demandé qu'une seule opération, le paquet n'est\n"
  "probablement pas installable et vous devriez envoyer un rapport de bogue."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "L'information suivante devrait vous aider à résoudre la situation : "
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Paquets défectueux"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Les paquets supplémentaires suivants seront installés : "
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Paquets suggérés :"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Paquets recommandés :"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Calcul de la mise à jour... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Échec"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Fait"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr ""
  "Erreur interne, la tentative de résolution du problème a cassé certaines "
  "parties"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "Vous devez spécifier au moins un paquet source"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Impossible de trouver une source de paquet pour %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Pas assez d'espace disponible sur %s"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Nécessité de prendre %so/%so dans les sources.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Nécessité de prendre %so dans les sources.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Récupération des sources %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Échec lors de la récupération de quelques archives."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "La commande de décompactage « %s » a échoué.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "La commande de construction « %s » a échoué.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Échec du processus fils"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "Il faut spécifier au moins un paquet pour vérifier les dépendances de "
  "construction"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Impossible d'obtenir les dépendances de construction pour %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s n'a pas de dépendance de construction.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1196,7 -1174,7 +1223,7 @@@ msgstr "
  "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne "
  "peut être trouvé"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1205,33 -1183,32 +1232,33 @@@ msgstr "
  "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version "
  "du paquet %s ne peut satisfaire à la version requise"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s "
  "est trop récent"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Impossible de satisfaire les dépendances %s pour %s : %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, 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
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Impossible d'activer les dépendances de construction"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Modules reconnus :"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1404,8 -1381,7 +1431,8 @@@ msgstr "
  "seules les erreurs"
  
  #: dselect/install:103
 -msgid "above this message are important. Please fix them and run [I]nstall again"
 +msgid ""
 +"above this message are important. Please fix them and run [I]nstall again"
  msgstr ""
  "précédant ce message sont importantes. Veuillez les corriger et\n"
  "démarrer l'[I]nstallation une nouvelle fois."
@@@ -1418,19 -1394,19 +1445,19 @@@ msgstr "Fusion des informations disponi
  msgid "Failed to create pipes"
  msgstr "Échec de création de tubes"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "Impossible d'exécuter gzip "
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Archive corrompue"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Type d'en-tête %u inconnu pour TAR, partie %s"
@@@ -1577,9 -1553,9 +1604,9 @@@ msgstr "
  "fichiers"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Lecture des listes de paquets"
  
@@@ -1663,8 -1639,7 +1690,8 @@@ msgstr "Ce n'est pas une archive DEB va
  #: 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
@@@ -1715,12 -1690,12 +1742,14 @@@ msgstr "Disque non trouvé.
  msgid "File not found"
  msgstr "Fichier non trouvé"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Impossible de statuer"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Impossible de modifier l'heure "
  
@@@ -1767,8 -1742,7 +1796,8 @@@ msgstr "
  #: methods/ftp.cc:265
  #, c-format
  msgid "Login script command '%s' failed, server said: %s"
 -msgstr "La commande « %s » du script de connexion a échoué, le serveur a 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
@@@ -1805,8 -1779,7 +1834,8 @@@ msgstr "Impossible de créer un connecte
  
  #: 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."
@@@ -1850,7 -1823,7 +1879,7 @@@ msgstr "Délai de connexion au port de d
  msgid "Unable to accept connection"
  msgstr "Impossible d'accepter une connexion"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Problème de hachage du fichier"
  
@@@ -1936,43 -1909,41 +1965,43 @@@ msgstr "
  msgid "Unable to connect to %s %s:"
  msgstr "Impossible de se connecter à %s %s :"
  
 -#: methods/gpgv.cc:64
 +#: methods/gpgv.cc:65
  #, c-format
  msgid "Couldn't access keyring: '%s'"
 -msgstr "Impossible d'accèder au porte-clés : « %s »"
 +msgstr "Impossible d'accéder au porte-clés : « %s »"
  
 -#: methods/gpgv.cc:99
 +#: 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:198
 -msgid "Internal error: Good signature, but could not determine key fingerprint?!"
 +#: methods/gpgv.cc:204
 +msgid ""
 +"Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
  "Erreur interne : signature correcte, mais il est impossible de déterminer "
  "l'empreinte de la clé."
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr "Au moins une signature non valable a été rencontrée."
  
 -#: methods/gpgv.cc:207
 +#: methods/gpgv.cc:213
  #, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
  msgstr ""
  "Impossible d'exécuter « %s » pour contrôler la signature\n"
  "(veuillez vérifier si gnupg est installé)."
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr "Erreur inconnue à l'exécution de gpgv"
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
  msgstr "Les signatures suivantes ne sont pas valables :\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
@@@ -1980,86 -1951,86 +2009,86 @@@ msgstr "
  "Les signatures suivantes n'ont pas pu être vérifiées car la clé publique "
  "n'est pas disponible :\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Ne parvient pas à ouvrir le tube pour %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Erreur de lecture du processus %s"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Attente des fichiers d'en-tête"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "J'ai une simple ligne d'en-tête au-dessus du caractère %u"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Mauvaise ligne d'en-tête"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "Le serveur http a envoyé une réponse dont l'en-tête est invalide"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  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:625
  msgid "Unknown date format"
  msgstr "Format de date inconnu"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Sélection défaillante"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Délai de connexion dépassé"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Erreur d'écriture du fichier de sortie"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Erreur d'écriture sur un fichier"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Erreur d'écriture sur le fichier"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Erreur de lecture du serveur"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Mauvais en-tête de donnée"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Échec de la connexion"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Erreur interne"
  
@@@ -2072,7 -2043,7 +2101,7 @@@ msgstr "Impossible de mapper un fichie
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Impossible de réaliser un mapping de %lu octets en mémoire"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "La sélection %s n'a pu être trouvée"
@@@ -2134,12 -2105,12 +2163,12 @@@ msgstr "Erreur syntaxique %s:%u : direc
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Erreur syntaxique %s:%u : valeur aberrante à la fin du fichier"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Erreur !"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Fait"
@@@ -2271,93 -2242,93 +2300,110 @@@ msgstr "Problème d'effacement du fichie
  msgid "Problem syncing the file"
  msgstr "Problème de synchronisation du fichier"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Cache des paquets vide"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Le fichier de cache des paquets est corrompu"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Le fichier de cache des paquets a une version incompatible"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Cet APT ne supporte pas le système de version « %s »"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "Le cache des paquets a été construit pour une architecture différente"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Dépend"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Pré-Dépend"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Suggère"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Recommande"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Est en conflit avec"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Remplace"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Rend obsolète"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "important"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "nécessaire"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "standard"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "optionnel"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "supplémentaire"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Construction de l'arbre des dépendances"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Versions possibles"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Génération des dépendances"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Fusion des informations disponibles"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Impossible d'ouvrir %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Erreur d'écriture du fichier %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Impossible de traiter le fichier %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Impossible de traiter le fichier %s (2)"
@@@ -2380,21 -2351,19 +2426,21 @@@ msgstr "Ligne %lu mal formée dans la li
  #: 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
  msgid "Opening %s"
  msgstr "Ouverture de %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "La ligne %u du fichier des listes de sources %s est trop longue."
@@@ -2407,14 -2376,12 +2453,14 @@@ msgstr "Ligne %u mal formée dans la lis
  #: 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
@@@ -2433,15 -2400,14 +2479,15 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Le type de fichier d'index « %s » n'est pas accepté"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
 -msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
 +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:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2449,7 -2415,7 +2495,7 @@@ msgstr "
  "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:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  "Impossible de corriger les problèmes, des paquets défecteux sont en mode "
@@@ -2494,12 -2460,12 +2540,12 @@@ msgstr "
  "Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la "
  "touche Entrée."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Le système de paquet « %s » n'est pas supporté"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Impossible de déterminer un type du système de paquets adéquat"
  
@@@ -2510,8 -2476,7 +2556,8 @@@ msgstr "Impossible de localiser %s.
  
  #: apt-pkg/srcrecords.cc:48
  msgid "You must put some 'source' URIs in your sources.list"
 -msgstr "Vous devez 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."
@@@ -2538,109 -2503,105 +2584,126 @@@ msgstr "Étiquette %s inconnue
  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:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Le cache possède un système de version incompatible"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Erreur apparue lors du traitement de %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Erreur apparue lors du traitement de %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Erreur apparue lors du traitement de %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Erreur apparue lors du traitement de %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Erreur apparue lors du traitement de %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Erreur apparue lors du traitement de %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  "Vous avez dépassé le nombre de noms de paquets que cet APT est capable de "
  "traiter."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  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
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr ""
++"Vous avez dépassé le nombre de versions que cet APT est capable de traiter."
+ 
 -#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  "Vous avez dépassé le nombre de dépendances que cet APT est capable de "
  "traiter."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Erreur apparue lors du traitement de %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  "Le paquet %s %s n'a pu être trouvé lors du traitement des dépendances des "
  "fichiers"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Impossible de localiser la liste des paquets sources %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Assemblage des fichiers listés dans les champs Provides"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
 -msgstr "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
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "impossible de changer le nom, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "Somme de contrôle MD5 incohérente"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
 -msgstr "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n"
 +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:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2650,7 -2611,7 +2713,7 @@@ msgstr "
  "sans doute que vous devrez corriger ce paquet manuellement (absence "
  "d'architecture)."
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2659,15 -2620,14 +2722,15 @@@ msgstr "
  "Je ne suis pas parvenu à localiser un fichier du paquet %s. Ceci signifie "
  "que vous devrez corriger manuellement ce paquet."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, 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:1392
  msgid "Size mismatch"
  msgstr "Taille incohérente"
  
@@@ -2676,7 -2636,7 +2739,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2685,47 -2645,47 +2748,49 @@@ msgstr "
  "Utilisation du point de montage %s pour le cédérom\n"
  "Montage du cédérom\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Identification..."
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Étiquette stockée : %s\n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Utilisation du point de montage %s pour le cédérom\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Démontage du cédérom\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Attente du disque...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Montage du cédérom...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Examen du disque à la recherche de fichiers d'index...\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "%i index de paquets trouvés, %i index de sources et %i signatures\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Ce nom n'est pas valable, veuillez recommencer.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2734,38 -2694,38 +2799,38 @@@ msgstr "
  "Ce disque s'appelle :\n"
  "« %s »\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Copie des listes de paquets..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Écriture de la nouvelle liste de sources\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Les entrées de listes de sources pour ce disque sont :\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Démontage du cédérom..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "%i enregistrements écrits.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "%i enregistrements écrits avec %i fichiers manquants.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2822,12 -2782,27 +2887,19 @@@ msgstr "Préparation de la suppression c
  msgid "Completely removed %s"
  msgstr "%s complètement supprimé"
  
++#: methods/rred.cc:219
++msgid "Could not patch file"
++msgstr "Impossible de modifier (« patch ») %s"
++
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Connexion fermée prématurément"
  
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
 -msgstr "Le format de la base de données n'est pas valable. Si vous mettez APT à jour, veuillez supprimer puis recréer la base de données."
 -
 -#: ftparchive/writer.cc:623
 -#, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr "  %s ne possède pas d'entrée « source override »\n"
 -
 -#: ftparchive/writer.cc:627
 -#, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr "  %s ne possède pas également pas d'entrée « binary override »\n"
 -
 -#: methods/rred.cc:219
 -msgid "Could not patch file"
 -msgstr "Impossible de modifier (« patch ») %s"
++#: apt-pkg/acquire-item.cc:1097
++#, fuzzy
++msgid "There is no public key available for the following key IDs:\n"
++msgstr ""
++"Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n"
+ 
 +#~ msgid "File date has changed %s"
 +#~ msgstr "La date du fichier a changé %s"
- 
- #~ msgid "Could not patch file"
- #~ msgstr "Impossible de modifier (« patch ») %s"
diff --combined po/gl.po
index 22c4d383d,3d9c184b3..6ce6b7960
--- a/po/gl.po
+++ b/po/gl.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-08-09 16:17+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2006-09-07 11:48+0200\n"
  "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
  "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@@ -14,147 -14,147 +14,157 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "O paquete %s versión %s ten unha dependencia incumprida:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Non se puido atopar o paquete %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Número total de nomes de paquetes : "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Paquetes normais: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Paquetes virtuais puros: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Paquetes virtuais simples: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Paquetes virtuais mixtos: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Non atopados: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Número total de versións distintas: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Número total de versións distintas: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Número total de dependencias: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Número total de relacións versión/ficheiro: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Número total de relacións versión/ficheiro: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Número total de mapas de Provides: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Número total de cadeas: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Espazo total de versións de dependencias: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Espazo de reserva total: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Espazo total contabilizado: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "O ficheiro de paquete %s está sen sincronizar."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Debe fornecer exactamente un patrón"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Non se atopou ningún paquete"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Ficheiros de paquetes:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  "A caché está sen sincronizar, non se pode facer referencia a un ficheiro de "
  "paquetes"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "[%4i] %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Paquetes inmobilizados:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(non se atopou)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Instalado: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(ningún)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Candidato: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Inmobilizado: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Táboa de versións:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2380 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s para %s %s compilado en %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -305,7 -305,7 +315,7 @@@ msgstr "
  "  -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/"
  "tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Non se puido escribir en %s"
@@@ -650,79 -650,79 +660,79 @@@ msgstr "Problema ao borrar %s
  msgid "Failed to rename %s to %s"
  msgstr "Non se puido cambiar o nome de %s a %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "S"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Erro na compilación da expresión regular - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "pero %s está instalado"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "pero hase instalar %s"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "pero non é instalable"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "pero é un paquete virtual"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "pero non está instalado"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "pero non se ha instalar"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " ou"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Os seguintes paquetes NOVOS hanse instalar:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Os seguintes paquetes hanse ELIMINAR:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Os seguintes paquetes consérvanse:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Os seguintes paquetes hanse actualizar:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Os seguintes paquetes hanse DESACTUALIZAR:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Os seguintes paquetes retidos hanse modificar:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (debido a %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -730,144 -730,144 +740,144 @@@ msgstr "
  "AVISO: Hanse eliminar os seguintes paquetes esenciais.\n"
  "¡Isto NON se debe facer a menos que saiba exactamente o que está a facer!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu actualizados, %lu instalados, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu reinstalados, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu desactualizados, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu hanse eliminar e %lu sen actualizar.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu non instalados ou eliminados de todo.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "A corrixir as dependencias..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " fallou."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Non se puido corrixir as dependencias."
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Non se puido minimizar o xogo de actualizacións"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Rematado"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "Pode querer executar \"apt-get -f install\" para corrixilos."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Dependencias incumpridas. Probe a empregar -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "AVISO: ¡Non se poden autenticar os seguintes paquetes!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "Ignórase o aviso de autenticación.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "¿Instalar estes paquetes sen verificación [s/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Non se puido autenticar algúns paquetes"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Houbo problemas e empregouse -y sen --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "Erro interno, chamouse a InstallPackages con paquetes rotos."
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Hai que eliminar paquetes pero a eliminación está desactivada."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Erro interno, a ordeación non rematou"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Non se puido bloquear o directorio de descargas"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2128
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Non se puido ler a lista de orixes."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  "Que raro... Os tamaños non coinciden, envíe email a apt@packages.debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Hai que recibir %sB/%sB de arquivos.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Hai que recibir %sB de arquivos.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "Despois de desempaquetar hanse ocupar %sB de disco adicionais.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Despois de desempaquetar hanse liberar %sB de disco.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Non se puido determinar o espazo libre en %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Non hai espazo libre de abondo en %s."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "Especificouse \"Só Triviais\" pero esta non é unha operación trivial."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "¡Si, fai o que digo!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -878,28 -878,28 +888,28 @@@ msgstr "
  "Para continuar escriba a frase \"%s\"\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Abortar."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "¿Quere continuar [S/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2025
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Non se puido obter %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Non se puido descargar algúns ficheiros"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2034
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Completouse a descarga no modo de só descargas"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -907,49 -907,49 +917,49 @@@ msgstr "
  "Non se puido obter algúns arquivos; probe con apt-get update ou --fix-"
  "missing."
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr ""
  "O emprego conxunto de --fix-missing e intercambio de discos non está "
  "soportado"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Non se puido corrixir os paquetes non dispoñibles."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "A abortar a instalación."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Nota, escóllese %s no canto de %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr "Omítese %s, xa está instalado e non se especificou a actualización.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "O paquete %s non está instalado, así que non se eliminou\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "O paquete %s é un paquete virtual fornecido por:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Instalado]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Debería escoller un para instalar."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -960,49 -960,49 +970,49 @@@ msgstr "
  "Isto pode significar que o paquete falla, está obsoleto ou só está\n"
  "dispoñible noutra fonte.\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Nembargantes, os seguintes paquetes substitúeno:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "O paquete %s non ten un candidato para a instalación"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "A reinstalación de %s non é posible, non se pode descargar.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s xa é a versión máis recente.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Non se atopou a versión \"%s\" de \"%s\""
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Non se atopou a versión \"%s\" de \"%s\""
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Escolleuse a versión %s (%s) de %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "A orde \"update\" non toma argumentos"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Non se puido bloquear o directorio de listas"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1010,25 -1010,25 +1020,44 @@@ msgstr "
  "Non se puido descargar algúns ficheiros de índices; ignoráronse ou "
  "empregáronse uns vellos no seu lugar."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "A seguinte información pode axudar a resolver a situación:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Erro interno, o resolvedor interno rompeu cousas"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Erro interno, AllUpgrade rompeu cousas"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Non se puido atopar o paquete %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1036,7 -1036,7 +1065,7 @@@ msgstr "
  "Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou "
  "especifique unha solución)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1047,7 -1047,7 +1076,7 @@@ msgstr "
  "unha situación imposible ou, se emprega a distribución inestable, que\n"
  "algúns paquetes solicitados aínda non se crearon ou moveron de Incoming."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1056,122 -1056,122 +1085,118 @@@ msgstr "
  "Xa que só solicitou unha soa operación, é bastante probable que o\n"
  "paquete non sea instalable e que se deba informar dun erro no paquete."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "A seguinte información pode axudar a resolver a situación:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Paquetes rotos"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Hanse instalar os seguintes paquetes extra:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1685
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Paquetes suxiridos:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1686
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Paquetes recomendados:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1706
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "A calcular a actualización... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Fallou"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1714
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Rematado"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Erro interno, o resolvedor interno rompeu cousas"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1887
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  "Ten que especificar alomenos un paquete para lle descargar o código fonte"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1917 cmdline/apt-get.cc:2146
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Non se puido atopar un paquete fonte para %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1961
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Omítese o ficheiro xa descargado \"%s\"\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1985
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Non hai espazo libre de abondo en %s"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1990
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1993
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Hai que recibir %sB de arquivos de fonte.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1999
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Obter fonte %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2030
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Non se puido recibir algúns arquivos."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2058
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2070
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Fallou a orde de desempaquetamento \"%s\".\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2071
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2088
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Fallou a codificación de %s.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2107
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "O proceso fillo fallou"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2123
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "Ten que especificar alomenos un paquete para lle comprobar as dependencias "
  "de compilación"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2151
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Non se puido obter a información de dependencias de compilación de %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2171
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s non ten dependencias de compilación.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2223
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1180,7 -1180,7 +1205,7 @@@ msgstr "
  "A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar "
  "o paquete %s"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2275
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1189,32 -1189,32 +1214,32 @@@ msgstr "
  "A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión "
  "dispoñible do paquete %s satisfai os requirimentos de versión"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2310
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é "
  "novo de máis"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2335
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2349
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Non se puideron satisfacer as dependencias de compilación de %s."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2353
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Non se puido procesar as dependencias de compilación"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2385
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Módulos soportados:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2426
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1555,9 -1555,9 +1580,9 @@@ msgstr "
  "Os directorios info e temp teñen que estar no mesmo sistema de ficheiros"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "A ler as listas de paquetes"
  
@@@ -1689,12 -1689,12 +1714,14 @@@ msgstr "Non se atopou o disco
  msgid "File not found"
  msgstr "Non se atopou o ficheiro"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
+ #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Non se atopou"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
+ #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Non se puido estabrecer a hora de modificación"
  
@@@ -1823,7 -1823,7 +1850,7 @@@ msgstr "A conexión do socket de datos 
  msgid "Unable to accept connection"
  msgstr "Non se pode aceptar a conexión"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Problema ao calcular o hash do ficheiro"
  
@@@ -1951,86 -1951,86 +1978,86 @@@ msgstr "
  "Non se puido verificar as seguintes sinaturas porque a chave pública non "
  "está dispoñible:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Non se puido abrir unha canle para %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Erro de lectura do proceso %s"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "A agardar polas cabeceiras"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Recibiuse unha soa liña de cabeceira en %u caracteres"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Liña de cabeceira incorrecta"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "O servidor HTTP enviou unha cabeceira de resposta non válida"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "O servidor HTTP enviou unha cabeceira Content-Length non válida"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "O servidor HTTP enviou unha cabeceira Content-Range non válida"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "Este servidor HTTP ten un soporte de rangos roto"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Formato de data descoñecido"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Fallou a chamada a select"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "A conexión esgotou o tempo"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Erro ao escribir no ficheiro de saída"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Erro ao escribir nun ficheiro"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Erro ao escribir no ficheiro"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Erro ao ler do servidor"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Datos da cabeceira incorrectos"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "A conexión fallou"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Erro interno"
  
@@@ -2043,7 -2043,7 +2070,7 @@@ msgstr "Non se pode facer mmap sobre u
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Non se puido facer mmap de %lu bytes"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Non se atopou a selección %s"
@@@ -2103,12 -2103,12 +2130,12 @@@ msgstr "Erro de sintaxe %s:%u: Non se s
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Erro de sintaxe %s:%u: Lixo extra á fin da liña"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... ¡Erro!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Rematado"
@@@ -2241,93 -2241,93 +2268,110 @@@ msgstr "Problema ao borrar o ficheiro
  msgid "Problem syncing the file"
  msgstr "Problema ao sincronizar o ficheiro"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Caché de paquetes baleira"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "O ficheiro de caché de paquetes está corrompido"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "O ficheiro de caché de paquetes é unha versión incompatible"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Este APT non soporta o sistema de versionamento \"%s\""
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "A caché de paquetes construiuse para unha arquitectura diferente"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Depende"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "PreDepende"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Suxire"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Recomenda"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Conflicto con"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Substitúe a"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Fai obsoleto a"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "importante"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "requirido"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "estándar"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "opcional"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "A construír a árbore de dependencias"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Versións candidatas"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Xeración de dependencias"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "A mesturar a información sobre paquetes dispoñibles"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Non se puido abrir %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Non se puido gravar o ficheiro %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Non se pode analizar o ficheiro de paquetes %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:186
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Non se pode analizar o ficheiro de paquetes %s (2)"
@@@ -2362,7 -2362,7 +2406,7 @@@ msgstr "Liña %lu mal formada na lista 
  msgid "Opening %s"
  msgstr "A abrir %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Liña %u longa de máis na lista de fontes %s."
@@@ -2398,14 -2398,14 +2442,14 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "O tipo de ficheiros de índices \"%s\" non está soportado"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  "O paquete %s ten que se reinstalar, pero non se pode atopar o seu arquivo."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2413,7 -2413,7 +2457,7 @@@ msgstr "
  "Erro, pkgProblemResolver::Resolve xerou interrupcións, pode estar causado "
  "por paquetes retidos."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr "Non se poden resolver os problemas, ten retidos paquetes rotos."
  
@@@ -2454,12 -2454,12 +2498,12 @@@ msgstr "O método %s non se iniciou cor
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr "Introduza o disco etiquetado: \"%s\" na unidade \"%s\" e prema Intro."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "O sistema de empaquetamento \"%s\" non está soportado"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Non se puido determinar un tipo de sistema de empaquetamento axeitado"
  
@@@ -2497,101 -2497,100 +2541,117 @@@ msgid "No priority (or zero) specified 
  msgstr ""
  "Non se indicou unha prioridade (ou indicouse cero) para a inmobilización"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "A caché ten un sistema de versionamento incompatible"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Ocorreu un erro ao procesar %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Ocorreu un erro ao procesar %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Ocorreu un erro ao procesar %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Ocorreu un erro ao procesar %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Ocorreu un erro ao procesar %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Ocorreu un erro ao procesar %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Ocorreu un erro ao procesar %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Ocorreu un erro ao procesar %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Ocorreu un erro ao procesar %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr "Guau, superou o número de nomes de paquetes que este APT pode manexar."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "Guau, superou o número de versións que este APT pode manexar."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "Guau, superou o número de versións que este APT pode manexar."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr "Guau, superou o número de dependencias que este APT pode manexar."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Ocorreu un erro ao procesar %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Ocorreu un erro ao procesar %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "Non se atopou o paquete %s %s ao procesar as dependencias de ficheiros"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Non se atopou a lista de paquetes fonte %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "A recoller as provisións de ficheiros"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "Erro de E/S ao gravar a caché de fontes"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "fallou o cambio de nome, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "Os MD5Sum non coinciden"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr ""
  "Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2600,7 -2599,7 +2660,7 @@@ msgstr "
  "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
  "ten que arranxar este paquete a man. (Falla a arquitectura)"
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2609,7 -2608,7 +2669,7 @@@ msgstr "
  "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
  "ten que arranxar este paquete a man."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
@@@ -2617,7 -2616,7 +2677,7 @@@ msgstr "
  "Os ficheiros de índices de paquetes están corrompidos. Non hai un campo "
  "Filename: para o paquete %s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Os tamaños non coinciden"
  
@@@ -2626,7 -2625,7 +2686,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "O bloque de provedor %s non contén unha pegada dixital"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2635,48 -2634,48 +2695,50 @@@ msgstr "
  "A empregar o punto de montaxe de CD-ROMs %s\n"
  "A montar o CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "A identificar.. "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Etiqueta armacenada: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "A empregar o punto de montaxe de CD-ROMs %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "A desmontar o CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "A agardar polo disco...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "A montar o CD-ROM...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "A buscar os ficheiros de índices no disco..\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr ""
  "Atopáronse %i índices de paquetes, %i índices de fontes e %i sinaturas\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Ese non é un nome válido, volva tentalo.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2685,38 -2684,38 +2747,38 @@@ msgstr "
  "Este disco chámase: \n"
  "\"%s\"\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "A copiar as listas de paquetes..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "A gravar a nova lista de fontes\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "As entradas da lista de fontes deste disco son:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "A desmontar o CD-ROM..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Graváronse %i rexistros.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Graváronse %i rexistros con %i ficheiros que fallan.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Graváronse %i rexistros con %i ficheiros que non coinciden\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2773,17 -2772,17 +2835,24 @@@ msgstr "A se preparar para eliminar %s 
  msgid "Completely removed %s"
  msgstr "Eliminouse %s completamente"
  
++#: methods/rred.cc:219
++#, fuzzy
++msgid "Could not patch file"
++msgstr "Non se puido abrir o ficheiro %s"
++
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "A conexión pechouse prematuramente"
  
++#: apt-pkg/acquire-item.cc:1097
++#, fuzzy
++msgid "There is no public key available for the following key IDs:\n"
++msgstr ""
++"Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n"
++
  #~ msgid "File date has changed %s"
  #~ msgstr "A data do ficheiro cambiou %s"
  
--#, fuzzy
--#~ msgid "Could not patch file"
--#~ msgstr "Non se puido abrir o ficheiro %s"
--
  #~ msgid "Reading file list"
  #~ msgstr "A ler a lista de paquetes"
  
diff --combined po/he.po
index 5bf53e2e3,bd8116bbd..6657dd0d0
--- a/po/he.po
+++ b/po/he.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  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: 2006-01-04 18:51+0100\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2004-06-10 19:58+0300\n"
  "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
  "Language-Team: Hebrew\n"
@@@ -15,145 -15,145 +15,153 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "לחבילה %s בגרסה %s יש תלויות שלא נענו:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "לא מצליח לאתר את החבילה %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr ""
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "חבילות נורמליות:"
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "חבילות וירטואליות לחלוטין:"
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "חסרות:"
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++msgid "Total Distinct Descriptions: "
++msgstr ""
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++msgid "Total Desc/File relations: "
++msgstr ""
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr ""
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "קובץ החבילה %s לא מסונכרן."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "אתה חייב לתת בדיוק תבנית אחת"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "לא נמצאו חבילות"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "קבצי חבילה:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "חבילות נעוצות:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(לא נמצא)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "מותקן:"
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(none)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "מועמדים:"
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "נעץ חבילה:"
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr ""
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
- #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s בשביל %s %s קומפל על %s %s\n"
  
- #: cmdline/apt-cache.cc:1659
 -#: cmdline/apt-cache.cc:1658
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -243,7 -243,7 +251,7 @@@ msgid "
  "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
  msgstr ""
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "לא מצליח לכתוב ל-%s"
@@@ -327,126 -327,115 +335,126 @@@ msgstr "אין התאמות
  msgid "Some files are missing in the package file group `%s'"
  msgstr "חלק מהקבצים חסרים בקבוצת קבצי החבילה `%s'"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "מסד הנתונים אינו תקין, הקובץ הועבר ל-%s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "מסד הנתונים ישן, מנסה לשדרג ל-%s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "לא מצליח לפתוח את קובץ מסד הנתונים %s: %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "תאריך הקובץ השתנה %s"
 +msgid "Failed to stat %s"
 +msgstr ""
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr ""
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr ""
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "W: לא מצליח לקרוא את הספריה %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "E: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "W: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "E: שגיאות תקפות לקובץ"
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "כשלון בפענוח %s"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr ""
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "כשלון בפתיחת %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr ""
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr ""
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** כשלון בקישור %s ל-%s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr ""
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr ""
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr ""
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "המתחזק של %s הוא %s ולא %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr ""
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr ""
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -542,79 -531,79 +550,79 @@@ msgstr "
  msgid "Failed to rename %s to %s"
  msgstr "כשלון בשינוי השם %s ל-%s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "Y"
  
- #: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr ""
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "לחבילות הבאות יש תלויות שלא נענו:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "אבל %s מותקנת"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "אבל %s הולכת להיות מותקנת"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "אבל היא אינה ניתנת להתקנה"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "אבל היא חבילה וירטואלית"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "אבל היא לא מותקנת"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "אבל היא אינה הולכת להיות מותקנת"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr "או"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "החבילות הבאות יוסרו:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "החבילות הבאות מעובות:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "החבילות הבאות ישודרגו:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "החבילות הבאות ישודרגו מטה:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "החבילות המחוזקות הבאות ישונו:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (בגלל %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  #, fuzzy
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
@@@ -623,144 -612,144 +631,144 @@@ msgstr "
  "א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n"
  "על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu משודרגים, %lu מותקנים חדשים, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu מותקנות מחדש, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu משודרגות מטה, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu יוסרו ו-%lu לא ישודרגו.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu לא מותקנות לחלוטין או הוסרו.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "מתקן תלויות..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr "כשלון."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "לא מצליח לתקן תלויות"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "א ז ה ר ה: החבילות החיוניות הבאות יוסרו"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr "סיום"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "אולי תרצה להריץ 'apt-get -f install' כדי לתקן את אלו."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "תלויות שלא נענו. נסה להשתמש באפשרות -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  #, fuzzy
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "החבילות הבאות ישודרגו:"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr ""
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr ""
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "היו בעיות והאפשרות -y היתה בשימוש ללא האפשרות --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr ""
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr ""
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr ""
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "לא מצליח לנעול את ספרית ההורדה."
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "רשימת המקורות לא ניתנת לקריאה."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "צריך לקבל %sB/%sB מתוך הארכיונים.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "צריך לקבל %sB מתוך הארכיונים.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "אחרי פריסה %sB נוספים יהיו בשימוש.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "אחרי פריסה %sB נוספים ישוחררו.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, fuzzy, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "אין לך מספיק מקום פנוי ב-%s."
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "אין לך מספיק מקום פנוי ב-%s."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "כן, עשה כפי שאני אומר!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -768,75 -757,75 +776,75 @@@
  " ?] "
  msgstr ""
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "בטל."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  #, fuzzy
  msgid "Do you want to continue [Y/n]? "
  msgstr "האם אתה רוצה להמשיך? [Y/n]"
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "כשלון בהבאת %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "כשלון בהורדת חלק מהקבצים"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד."
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
  msgstr ""
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr ""
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr ""
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr ""
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr ""
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr ""
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -844,79 -833,79 +852,98 @@@
  "is only available from another source\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr ""
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr ""
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr ""
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr ""
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr ""
  
- #: cmdline/apt-get.cc:1326
 -#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr ""
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
  msgstr ""
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr ""
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "שגיאה פנימית, כלשון ביצירת %s"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 -#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:1516
 -#: cmdline/apt-get.cc:1525
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1546
 -#: cmdline/apt-get.cc:1555
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1549
 -#: cmdline/apt-get.cc:1558
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
  msgstr ""
  
- #: cmdline/apt-get.cc:1561
 -#: cmdline/apt-get.cc:1570
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -924,164 -913,164 +951,160 @@@
  "or been moved out of Incoming."
  msgstr ""
  
- #: cmdline/apt-get.cc:1569
 -#: cmdline/apt-get.cc:1578
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
  "that package should be filed."
  msgstr ""
  
- #: cmdline/apt-get.cc:1574
 -#: cmdline/apt-get.cc:1583
--msgid "The following information may help to resolve the situation:"
--msgstr ""
--
- #: cmdline/apt-get.cc:1577
 -#: cmdline/apt-get.cc:1586
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr ""
  
- #: cmdline/apt-get.cc:1603
 -#: cmdline/apt-get.cc:1612
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1683
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1684
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1704
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr ""
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr ""
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1712
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr ""
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  #, fuzzy
  msgid "Internal error, problem resolver broke stuff"
  msgstr "שגיאה פנימית, כלשון ביצירת %s"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1885
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1959
++#: cmdline/apt-get.cc:2043
  #, c-format
 -msgid "Skiping already downloaded file '%s'\n"
 +msgid "Skipping already downloaded file '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1983
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1991
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1997
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2028
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr ""
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2056
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2068
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2069
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2086
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2105
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr ""
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2121
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2149
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2169
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2221
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr ""
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2273
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
  "package %s can satisfy version requirements"
  msgstr ""
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2308
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2333
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2347
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr ""
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2351
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr ""
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2383
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr ""
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2424
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1209,19 -1198,19 +1232,19 @@@ msgstr "
  msgid "Failed to create pipes"
  msgstr ""
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr ""
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr ""
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr ""
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr ""
@@@ -1366,9 -1355,9 +1389,9 @@@ msgid "The info and temp directories ne
  msgstr ""
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr ""
  
@@@ -1382,7 -1371,7 +1405,7 @@@ msgstr "
  msgid "Internal error getting a package name"
  msgstr ""
  
 -#: apt-inst/deb/dpkgdb.cc:205
 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
  msgid "Reading file listing"
  msgstr ""
  
@@@ -1426,6 -1415,10 +1449,6 @@@ msgstr "
  msgid "The pkg cache must be initialized first"
  msgstr ""
  
 -#: apt-inst/deb/dpkgdb.cc:386
 -msgid "Reading file list"
 -msgstr ""
 -
  #: apt-inst/deb/dpkgdb.cc:443
  #, c-format
  msgid "Failed to find a Package: header, offset %lu"
@@@ -1497,12 -1490,12 +1520,14 @@@ msgstr "(לא נמצא)
  msgid "File not found"
  msgstr ""
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr ""
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr ""
  
@@@ -1628,7 -1621,7 +1653,7 @@@ msgstr "
  msgid "Unable to accept connection"
  msgstr ""
  
- #: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 -#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr ""
  
@@@ -1651,7 -1644,7 +1676,7 @@@ msgstr "
  msgid "Query"
  msgstr ""
  
 -#: methods/ftp.cc:1106
 +#: methods/ftp.cc:1109
  msgid "Unable to invoke "
  msgstr ""
  
@@@ -1680,156 -1673,155 +1705,156 @@@ msgstr "
  msgid "Could not connect to %s:%s (%s), connection timed out"
  msgstr ""
  
 -#: methods/connect.cc:106
 +#: methods/connect.cc:108
  #, c-format
  msgid "Could not connect to %s:%s (%s)."
  msgstr ""
  
  #. We say this mainly because the pause here is for the
  #. ssh connection that is still going
 -#: methods/connect.cc:134 methods/rsh.cc:425
 +#: methods/connect.cc:136 methods/rsh.cc:425
  #, c-format
  msgid "Connecting to %s"
  msgstr ""
  
 -#: methods/connect.cc:165
 +#: methods/connect.cc:167
  #, c-format
  msgid "Could not resolve '%s'"
  msgstr ""
  
 -#: methods/connect.cc:171
 +#: methods/connect.cc:173
  #, c-format
  msgid "Temporary failure resolving '%s'"
  msgstr ""
  
 -#: methods/connect.cc:174
 +#: methods/connect.cc:176
  #, c-format
  msgid "Something wicked happened resolving '%s:%s' (%i)"
  msgstr ""
  
 -#: methods/connect.cc:221
 +#: methods/connect.cc:223
  #, c-format
  msgid "Unable to connect to %s %s:"
  msgstr ""
  
 -#: methods/gpgv.cc:92
 +#: methods/gpgv.cc:65
 +#, c-format
 +msgid "Couldn't access keyring: '%s'"
 +msgstr ""
 +
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr ""
  
 -#: methods/gpgv.cc:191
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
  
 -#: methods/gpgv.cc:196
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr ""
  
 -#. FIXME String concatenation considered harmful.
 -#: methods/gpgv.cc:201
 -msgid "Could not execute "
 -msgstr ""
 -
 -#: methods/gpgv.cc:202
 -msgid " to verify signature (is gnupg installed?)"
 +#: methods/gpgv.cc:213
 +#, c-format
 +msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
  msgstr ""
  
 -#: methods/gpgv.cc:206
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr ""
  
 -#: methods/gpgv.cc:237
 +#: methods/gpgv.cc:249
  #, fuzzy
  msgid "The following signatures were invalid:\n"
  msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:"
  
 -#: methods/gpgv.cc:244
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
  msgstr ""
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr ""
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr ""
  
- #: methods/http.cc:376
 -#: methods/http.cc:381
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr ""
  
- #: methods/http.cc:522
 -#: methods/http.cc:527
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr ""
  
- #: methods/http.cc:530
 -#: methods/http.cc:535
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr ""
  
- #: methods/http.cc:549 methods/http.cc:556
 -#: methods/http.cc:554 methods/http.cc:561
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr ""
  
- #: methods/http.cc:585
 -#: methods/http.cc:590
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr ""
  
- #: methods/http.cc:600
 -#: methods/http.cc:605
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr ""
  
- #: methods/http.cc:602
 -#: methods/http.cc:607
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr ""
  
- #: methods/http.cc:626
 -#: methods/http.cc:631
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr ""
  
- #: methods/http.cc:773
 -#: methods/http.cc:778
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr ""
  
- #: methods/http.cc:778
 -#: methods/http.cc:783
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr ""
  
- #: methods/http.cc:801
 -#: methods/http.cc:806
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr ""
  
- #: methods/http.cc:832
 -#: methods/http.cc:837
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr ""
  
- #: methods/http.cc:860
 -#: methods/http.cc:865
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr ""
  
- #: methods/http.cc:874
 -#: methods/http.cc:879
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr ""
  
- #: methods/http.cc:876
 -#: methods/http.cc:881
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr ""
  
- #: methods/http.cc:1107
 -#: methods/http.cc:1112
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr ""
  
- #: methods/http.cc:1124
 -#: methods/http.cc:1129
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr ""
  
- #: methods/http.cc:1215
 -#: methods/http.cc:1220
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr ""
  
@@@ -1842,7 -1834,7 +1867,7 @@@ msgstr "
  msgid "Couldn't make mmap of %lu bytes"
  msgstr ""
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr ""
@@@ -1902,12 -1894,12 +1927,12 @@@ msgstr "
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr ""
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr ""
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr ""
@@@ -2039,93 -2031,93 +2064,109 @@@ msgstr "
  msgid "Problem syncing the file"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr ""
  
- #: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
 -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr ""
  
- #: apt-pkg/depcache.cc:62
 -#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr ""
  
- #: apt-pkg/depcache.cc:91
 -#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:73
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++msgid "Reading state information"
++msgstr ""
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "כשלון בפתיחת %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "כשלון בפענוח %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr ""
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:160
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr ""
@@@ -2160,7 -2152,7 +2201,7 @@@ msgstr "
  msgid "Opening %s"
  msgstr ""
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr ""
@@@ -2193,19 -2185,19 +2234,19 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr ""
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
  msgstr ""
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  
@@@ -2219,16 -2211,9 +2260,16 @@@ msgstr "
  msgid "Archive directory %spartial is missing."
  msgstr ""
  
 -#: apt-pkg/acquire.cc:821
 +#. only show the ETA if it makes sense
 +#. two days
 +#: apt-pkg/acquire.cc:823
  #, c-format
 -msgid "Downloading file %li of %li (%s remaining)"
 +msgid "Retrieving file %li of %li (%s remaining)"
 +msgstr ""
 +
 +#: apt-pkg/acquire.cc:825
 +#, c-format
 +msgid "Retrieving file %li of %li"
  msgstr ""
  
  #: apt-pkg/acquire-worker.cc:113
@@@ -2246,12 -2231,12 +2287,12 @@@ msgstr "
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr ""
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr ""
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr ""
  
@@@ -2285,119 -2270,115 +2326,134 @@@ msgstr "
  msgid "No priority (or zero) specified for pin"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr ""
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr ""
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr ""
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr ""
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:640
 -#: apt-pkg/acquire-item.cc:719
++#: apt-pkg/acquire-item.cc:1097
 +msgid "There are no public key available for the following key IDs:\n"
 +msgstr ""
 +
- #: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
  "to manually fix this package. (due to missing arch)"
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:812
 -#: apt-pkg/acquire-item.cc:778
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
  "manually fix this package."
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:848
 -#: apt-pkg/acquire-item.cc:814
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:935
 -#: apt-pkg/acquire-item.cc:901
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr ""
  
@@@ -2406,92 -2387,92 +2462,94 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
  "Mounting CD-ROM\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr ""
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr ""
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:647
++#: apt-pkg/cdrom.cc:673
  #, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
  "'%s'\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr ""
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr ""
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr ""
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2538,17 -2519,14 +2596,25 @@@ msgstr "
  
  #: apt-pkg/deb/dpkgpm.cc:378
  #, c-format
 -msgid "Preparing for remove with config %s"
 +msgid "Preparing to completely remove %s"
  msgstr ""
  
  #: apt-pkg/deb/dpkgpm.cc:379
  #, c-format
 -msgid "Removed with config %s"
 +msgid "Completely removed %s"
 +msgstr ""
 +
++#: methods/rred.cc:219
++msgid "Could not patch file"
+ msgstr ""
+ 
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr ""
 +
++#: apt-pkg/acquire-item.cc:1097
++msgid "There is no public key available for the following key IDs:\n"
++msgstr ""
++
 +#~ msgid "File date has changed %s"
 +#~ msgstr "תאריך הקובץ השתנה %s"
diff --combined po/hu.po
index 3e123ff85,72c0f2965..db5037b3a
--- a/po/hu.po
+++ b/po/hu.po
@@@ -7,10 -7,10 +7,10 @@@ msgid "
  msgstr ""
  "Project-Id-Version: hu\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-05-27 13:46+0200\n"
 -"PO-Revision-Date: 2006-07-02 07:34+0100\n"
 -"Last-Translator: SZERVÑC Attila <sas@321.hu>\n"
 -"Language-Team: Hungarian <debian-l10-hungarian>\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
 +"PO-Revision-Date: 2006-10-21 11:04+0100\n"
 +"Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 +"Language-Team: Hungarian <debian-l10n-hungarian>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
@@@ -19,146 -19,146 +19,154 @@@
  "X-Poedit-Language: Hungarian\n"
  "X-Poedit-Country: HUNGARY\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "%s csomag %s verziójának teljesítetlen függősége van:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Az alábbi csomag nem található: %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Csomagnevek összesen : "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Normális csomagok: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Teljesen virtuális csomagok: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Egyedi virtuális csomagok: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Vegyes virtuális csomagok: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Hiányzik: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Különböző verziók összesen: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++msgid "Total Distinct Descriptions: "
++msgstr "Összes külső leírás: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Függőségek összesen: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Verzió/Fájl kapcsolatok összesen: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++msgid "Total Desc/File relations: "
++msgstr "Összes Leírás/Fájl kapcsolat: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "\"Előkészít\" kapcsolatok összesen: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Minták összesen: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Függőségi-verzió terület összesen: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Slack terület összesen: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Terület összesen: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "%s csomag fájl szinkronon kívül."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Pontosan egy mintát kell megadnod"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Nem találtam csomagokat"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Csomagfájlok:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  "A gyorsítótár nincs szinkronban, nem lehet kereszthivatkozni a csomag fájlra"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Rögzített csomagok:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(nem találtam)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Telepítve: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(nincs)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Jelölt: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Csomag Tű: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Verziótáblázat:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s ehhez: %s %s fordítás ideje: %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -305,7 -305,7 +313,7 @@@ msgstr "
  "  -c=? Ezt a konfigurációs fájlt olvassa be\n"
  "  -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Nem lehet írni ebbe: %s"
@@@ -429,128 -429,115 +437,128 @@@ msgstr "Nincs illeszkedő kiválasztás
  msgid "Some files are missing in the package file group `%s'"
  msgstr "Néhány fájl hiányzik a(z) '%s' csomagfájl-csoportból"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "DB megsérült, a fájl átnevezve %s.old-ra"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "DB régi, megkísérlem frissíteni erre: %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +"DB formátum érvénytelen. Ha az apt régebbi változatáról frissítettél, töröld "
 +"és hozd újra létre az adatbázist."
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "A fájl dátuma megváltozott %s"
 +msgid "Failed to stat %s"
 +msgstr "%s elérése sikertelen"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "Az archívumnak nincs vezérlő rekordja"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "Nem sikerült egy mutatóhoz jutni"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "F: nem lehet a(z) %s könyvtárat olvasni\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "F: %s nem érhető el\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "H: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "F: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "H: Hibás a fájl "
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "Nem sikerült feloldani ezt: %s"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "Fabejárás nem sikerült"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "%s megnyitása sikertelen"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr " DeLink %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "readlink nem hajtható végre erre: %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "unlink nem hajtható végre erre: %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** %s linkelése ehhez: %s sikertelen"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " DeLink elérte %sB korlátját.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "%s elérése sikertelen"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "Az archívumnak nem volt csomag mezője"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr "  %s nem rendelkezik felülbíráló bejegyzéssel\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "  %s karbantartója %s, nem %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr "  %s nem rendelkezik forrás felülbíráló bejegyzéssel\n"
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr "  %s nem rendelkezik bináris felülbíráló bejegyzéssel sem\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -646,79 -633,79 +654,79 @@@ msgstr "Hiba %s elláncolásakor
  msgid "Failed to rename %s to %s"
  msgstr "Nem sikerült átnevezni %s-t erre: %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "I"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Regex fordítási hiba - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "de %s van telepítve"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "de csak %s telepíthető"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "de az nem telepíthető"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "de az egy virtuális csomag"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "de az nincs telepítve"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "de az nincs telepítésre megjelölve"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " vagy"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Az alábbi ÚJ csomagok lesznek telepítve:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Az alábbi csomagok vissza lesznek tartva:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Az alábbi csomagok frissítve lesznek:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Az alábbi csomagok ÖREGBÍTÉSRE kerülnek:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Az alábbi visszafogott csomagokat cserélem:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (%s miatt) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -726,143 -713,143 +734,143 @@@ msgstr "
  "FIGYELEM: Az alábbi alapvető csomagok lesznek eltávolítva\n"
  "NE tedd ezt, míg nem tudod pontosan, mit csinálsz!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu frissített, %lu újonnan telepített, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu újratelepítendő, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu kerül öregbítésre, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu eltávolítandó és %lu nem frissített.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Függőségek javítása..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " sikertelen."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Nem lehet javítani a függőségeket"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Kész"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "Ezek kijavításához próbáld futtatni az 'apt-get -f install'-t ."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Teljesítetlen függőségek. Próbáld a -f használatával."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "FIGYELEM: Az alábbi csomagok nem hitelesíthetők!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "A hitelesítési figyelmeztetést átléptem.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Valóban telepíted e csomagokat ellenőrzés nélkül (i/N)? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Néhány csomag nem hitelesíthető"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Problémák vannak és a -y -t használtad --force-yes nélkül"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyezett."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Belső hiba, a rendezés nem zárult"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Nem tudom zárolni a letöltési könyvtárat"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "A források listája olvashatatlan."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr "Ez durva... A méretek nem egyeznek, írj ide:apt@packages.debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Letöltendő az archívumokból: %sB/%sB\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Letöltés az archívumokból: %sB\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "Kicsomagolás után %sB lemezterületet használok fel\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Kicsomagolás után %sB lemezterület szabadul fel.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Nem határozható meg a szabad hely itt: %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Nincs elég szabad hely itt:  %s."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "A 'Trivial Only' meg van adva, de ez nem egy triviális művelet."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Igen, tedd amit mondok!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -873,28 -860,28 +881,28 @@@ msgstr "
  "A folytatáshoz írd be ezt: '%s'\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Megszakítva."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Folytatni akarod [Y/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Sikertelen letöltés: %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Néhány fájlt nem sikerült letölteni"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "A letöltés befejeződött a 'csak letöltés' módban"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -902,47 -889,47 +910,47 @@@ msgstr "
  "Nem lehet letölteni néhány archívumot.\n"
  " Próbáld ki az apt-get update -et vagy a --fix-missing -et."
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing és média csere jelenleg nem támogatott"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Nem lehet javítani a hiányzó csomagokat."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Telepítés megszakítása."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Megjegyzés: %s kiválasztása %s helyett\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr "%s kihagyása, ez már telepítve van és a frissítés nincs beállítva.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "A megadott %s csomag nincs telepítve, így hát nem is töröltem\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "%s egy virtuális csomag, melyet az alábbi csomagok adnak:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Telepítve]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Egyet név szerint ki kell jelölnöd a telepítésre."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -952,49 -939,49 +960,49 @@@ msgstr "
  "%s csomag nem elérhető, de egy másik hivatkozik rá\n"
  ".A kért csomag tehát: hiányzik, elavult vagy csak más forrásból érhető el\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "De az alábbi csomagok felváltják:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "%s csomagnak nincs e telepítéshez kijelölhető változata"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s már a legújabb verzió.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "'%s' kiadás ehhez: '%s' nem található"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "'%s' verzió ehhez: '%s' nem található"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "Az update parancsnak nincsenek argumentumai"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Nem tudom a listakönyvtárat zárolni"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1002,25 -989,25 +1010,44 @@@ msgstr "
  "Néhány index fájl letöltése meghiúsult, ezeket mellőzöm vagy régi "
  "változatukat használom."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "Az alábbi információ segíthet megoldani a helyzetet:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Belső hiba, hibafeloldó gond"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Belső hiba, AllUpgrade megsértett valamit"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Az alábbi csomag nem található: %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1028,7 -1015,7 +1055,7 @@@ msgstr "
  "Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül "
  "(vagy telepítsd a függőségeket is!)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1040,7 -1027,7 +1067,7 @@@ msgstr "
  "használod, akkor néhány igényelt csomag még nem készült el vagy ki\n"
  "lett mozdítva az Incoming-ból."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1050,122 -1037,122 +1077,118 @@@ msgstr "
  "hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n"
  "kitölteni a csomaghoz."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "Az alábbi információ segíthet megoldani a helyzetet:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Törött csomagok"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Javasolt csomagok:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Ajánlott csomagok:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Frissítés kiszámítása... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Sikertelen"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Kész"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Belső hiba, hibafeloldó gond"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  "Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Nem található forráscsomag ehhez: %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "A már letöltött '%s' fájl kihagyása\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Nincs elég szabad hely itt: %s"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "%sB/%sB forrás-archívumot kell letölteni.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "%sB forrás-archívumot kell letölteni.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Forrás letöltése: %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Nem sikerült néhány archívumot letölteni."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "'%s' kibontási parancs nem sikerült.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "'%s' elkészítési parancs nem sikerült.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Hiba a gyermekfolyamatnál"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni "
  "kell"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Nem lehet %s fordítási-függőség információját beszerezni"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "Nincs fordítási függősége a következőnek: %s.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1174,7 -1161,7 +1197,7 @@@ msgstr "
  "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem "
  "található"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1183,32 -1170,32 +1206,32 @@@ msgstr "
  "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a "
  "verzió-követelményt kielégítő elérhető verziója."
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl "
  "friss."
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s "
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "%s építési függőségei nem elégíthetőek ki."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Nem sikerült az építési függőségeket feldolgozni"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Támogatott modulok:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1386,19 -1373,19 +1409,19 @@@ msgstr "Elérhető információk egyesÃ
  msgid "Failed to create pipes"
  msgstr "Nem sikerült csöveket létrehozni"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "Nem sikerült a gzipet futtatni "
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Hibás archívum"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Tar ellenőrzőösszeg nem egyezik, az archívum megsérült"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Ismeretlen a(z) %u TAR fejléc típus, %s tag"
@@@ -1543,9 -1530,9 +1566,9 @@@ msgid "The info and temp directories ne
  msgstr "Az info és temp könyvtáraknak egy fájlrendszeren kell lenniük"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Csomaglisták olvasása"
  
@@@ -1678,12 -1665,12 +1701,14 @@@ msgstr "Nem találom a lemezt
  msgid "File not found"
  msgstr "Nem találom a fájlt"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Nem érhető el"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "A módosítási időt beállítása sikertelen"
  
@@@ -1811,7 -1798,7 +1836,7 @@@ msgstr "Az adat sockethez kapcsolódá
  msgid "Unable to accept connection"
  msgstr "Nem lehet elfogadni a kapcsolatot"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Probléma a fájl hash értékének meghatározásakor"
  
@@@ -1895,124 -1882,124 +1920,124 @@@ msgstr "Valami rossz történt '%s: %s
  msgid "Unable to connect to %s %s:"
  msgstr "Sikertelen kapcsolódás ide: %s %s:"
  
 -#: methods/gpgv.cc:64
 +#: methods/gpgv.cc:65
  #, c-format
  msgid "Couldn't access keyring: '%s'"
  msgstr "%s kulcstartó nem érhető el"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr "H: Az Acquire::gpgv::Options argumentum lista túl hosszú. Kilépek."
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr "Belső hiba: Jó aláírás, de meghatározhatatlan kulcs ujjlenyomat?!"
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr "1 vagy több érvénytelen aláírást találtam."
  
 -#: methods/gpgv.cc:207
 +#: methods/gpgv.cc:213
  #, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
  msgstr "'%s' nem futtatható az aláírás ellenőrzéséhez (a gnupg telepítve van?)"
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr "Ismeretlen gpgv futtatási hiba"
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
  msgstr "Az alábbi aláírások érvénytelenek voltak:\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
  msgstr ""
  "Az alábbi aláírások nem igazolhatók, mert a nyilvános kulcs nem elérhető:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Nem lehet csövet nyitni ehhez: %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Olvasási hiba %s folyamattól"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Várakozás a fejlécekre"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Egyetlen fejléc sort kaptam, ami több mint %u karakteres"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Rossz fejléc sor"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "A http kiszolgáló egy érvénytelen válaszfejlécet küldött"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "A http kiszolgáló egy érvénytelen Content-Length fejlécet küldött"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "A http kiszolgáló egy érvénytelen Content-Range fejlécet küldött"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "Ez a http szerver támogatja a sérült tartományokat "
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Ismeretlen dátum formátum"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Sikertelen kiválasztás"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Időtúllépés a kapcsolatban"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Hiba a kimeneti fájl írásakor"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Hiba fájl írásakor"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Hiba a fájl írásakor"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Hiba a kiszolgálóról olvasáskor"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Rossz fejlécadat"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Sikertelen kapcsolódás"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Belső hiba"
  
@@@ -2026,7 -2013,7 +2051,7 @@@ msgstr "Nem lehet mmap-olni egy üres f
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Nem sikerült %lu bájtot mmap-olni"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "%s kiválasztás nem található"
@@@ -2086,12 -2073,12 +2111,12 @@@ msgstr "Szintaktikai hiba %s: %u: '%s' 
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Szintaktikai hiba %s: %u: fölösleges szemét a fájl végén"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Hiba!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Kész"
@@@ -2224,93 -2211,93 +2249,110 @@@ msgstr "Hiba a fájl leválasztásával
  msgid "Problem syncing the file"
  msgstr "Hiba a fájl szinkronizálásakor"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Üres csomag-gyorstár"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "A csomag-gyorstár fájl megsérült"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "A csomag-gyorstár fájl inkompatibilis verziójú"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Ez az APT nem támogatja a(z) '%s' verziórendszert"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "A csomag-gyorstár egy másik architektúrához készült"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Függ ettől"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Függ ettől (előfüggés)"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Javasolja"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Ajánlja"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Ütközik"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Kicseréli"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Elavulttá teszi"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "fontos"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "szükséges"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "szabványos"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "opcionális"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Függőségi fa építése"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Lehetséges verziók"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Függőség-generálás"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Elérhető információk egyesítése"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "%s megnyitása sikertelen"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "%s fájl írása sikertelen"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)"
@@@ -2345,7 -2332,7 +2387,7 @@@ msgstr "A(z) %lu. sor hibás %s forrás
  msgid "Opening %s"
  msgstr "%s megnyitása"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "A(z) %u. sor túl hosszú %s forráslistában."
@@@ -2381,14 -2368,14 +2423,14 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "A(z) '%s' indexfájltípus nem támogatott"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  "A(z) %s csomagot újra kell telepíteni, de nem találok archívumot hozzá."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2396,7 -2383,7 +2438,7 @@@ msgstr "
  "Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott "
  "csomagok okozhatják."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  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."
@@@ -2438,12 -2425,12 +2480,12 @@@ msgstr "A(z) %s metódus nem indult el 
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr "Tedd be a(z) %s címkéjű lemezt a(z) %s meghajtóba és üss entert"
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "A(z) '%s' csomagrendszer nem támogatott"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "A megfelelő csomagrendszer típus nem határozható meg"
  
@@@ -2478,105 -2465,104 +2520,121 @@@ msgstr "A(z) %s tűtípus nem értelmez
  msgid "No priority (or zero) specified for pin"
  msgstr "Nincs prioritás (vagy nulla) megadva a tűhöz"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "A gyorsítótárnak inkompatibilis verziórendszere van"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Hiba történt %s feldolgozásakor (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Hiba történt %s feldolgozásakor (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Hiba történt %s feldolgozásakor (NewFileDesc1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Hiba történt %s feldolgozásakor (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Hiba történt %s feldolgozásakor (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Hiba történt %s feldolgozásakor (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Hiba történt %s feldolgozásakor (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Hiba történt %s feldolgozásakor (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Hiba történt %s feldolgozásakor (NewFileDesc2)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  "Ez nem semmi, túllépted a csomagnevek számát, amit ez az APT kezelni tud!"
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  "Ez nem semmi, túllépted a csomagverziók számát, amit ez az APT kezelni tud!"
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr ""
++"Ez nem semmi, túllépted a csomagleírások számát, amit ez az APT kezelni tud!"
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  "Ez nem semmi, túllépted a függőségek számát, amit ez az APT kezelni tud."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Hiba történt %s feldolgozásakor (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Hiba történt %s feldolgozásakor (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  "%s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása közben"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni"
  
  # FIXME
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "\"Előkészít\" kapcsolatok összegyűjtése"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "IO hiba a forrás-gyorsítótár mentésekor"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "sikertelen átnevezés, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "Az MD5Sum nem megfelelő"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2585,7 -2571,7 +2643,7 @@@ msgstr "
  "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
  "kell kijavítani a csomagot. (hiányzó arch. miatt)"
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2594,14 -2580,14 +2652,14 @@@ msgstr "
  "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
  "kell kijavítani a csomagot."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  "A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "A méret nem megfelelő"
  
@@@ -2610,7 -2596,7 +2668,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "A(z) %s terjesztő blokk nem tartalmaz ujjlenyomatot"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2619,47 -2605,47 +2677,49 @@@ msgstr "
  "%s CD-ROM csatolási pont használata\n"
  "CD-ROM csatolása\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Azonosítás.. "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Tárolt címke: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "%s CD-ROM csatolási pont használata\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "CD-ROM leválasztása\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Várakozás a lemezre...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "CD-ROM felcsatolása...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Indexfájlok keresése a lemezen...\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "%i csomagindexet, %i forrásindexet és %i aláírást találtam\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "E név érvénytelen, próbáld újra.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2668,38 -2654,38 +2728,38 @@@ msgstr "
  "E lemez neve: \n"
  "%s\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Csomaglisták másolása..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Új forráslista írása\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "E lemezhez tartozó forráslista-bejegyzések a következők:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "CD-ROM leválasztása..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "%i rekord kiírva.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "%i rekord kiírva, %i hiányzó fájllal.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "%i rekord kiírva %i hibásan párosított fájllal\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n"
@@@ -2754,41 -2740,54 +2814,30 @@@ msgstr "%s teljes eltávolítása elők
  msgid "Completely removed %s"
  msgstr "%s teljesen eltávolítva"
  
++#: methods/rred.cc:219
++msgid "Could not patch file"
++msgstr "%s fájl foltozása sikertelen"
++
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "A kapcsolat idő előtt lezárult"
  
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
 -msgstr ""
 -
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr "  %s nem rendelkezik felülbíráló bejegyzéssel\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr "  %s nem rendelkezik felülbíráló bejegyzéssel\n"
 -
 -#~ msgid "Total Distinct Descriptions: "
 -#~ msgstr "Összes külső leírás: "
++#: apt-pkg/acquire-item.cc:1097
++#, fuzzy
++msgid "There is no public key available for the following key IDs:\n"
++msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n"
+ 
 -#~ msgid "Total Desc/File relations: "
 -#~ msgstr "Összes Leírás/Fájl kapcsolat: "
 +#~ msgid "File date has changed %s"
 +#~ msgstr "A fájl dátuma megváltozott %s"
  
- #~ msgid "Total Distinct Descriptions: "
- #~ msgstr "Összes külső leírás: "
- 
- #~ msgid "Total Desc/File relations: "
- #~ msgstr "Összes Leírás/Fájl kapcsolat: "
- 
  #~ msgid "Reading file list"
  #~ msgstr "Fájllista olvasása"
  
  #~ msgid "Could not execute "
  #~ msgstr "Nem futtatható"
  
--#~ msgid "Error occured while processing %s (NewFileDesc1)"
--#~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc1)"
--
--#~ msgid "Error occured while processing %s (NewFileDesc2)"
--#~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc2)"
--
--#~ msgid "Wow, you exceeded the number of descriptions this APT is capable of."
--#~ msgstr ""
--#~ "Ez nem semmi, túllépted a csomagleírások számát, amit ez az APT kezelni "
--#~ "tud!"
--
  #~ msgid "Preparing for remove with config %s"
  #~ msgstr "Előkészítés eltávolításhoz %s konfigurálásával"
  
  #~ msgid "Removed with config %s"
  #~ msgstr "%s konfigurálásával eltávolítva"
--
--#~ msgid "Could not patch file"
--#~ msgstr "%s fájl foltozása sikertelen"
diff --combined po/it.po
index 7ccb32d1e,c9fd04ee0..0cf970b94
--- a/po/it.po
+++ b/po/it.po
@@@ -5,154 -5,154 +5,164 @@@ msgid "
  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: 2006-05-27 13:46+0200\n"
 -"PO-Revision-Date: 2006-02-14 11:41+0100\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
 +"PO-Revision-Date: 2006-10-12 09:27+0200\n"
  "Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n"
  "Language-Team: Italian <it@li.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=iso-8859-15\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Il pacchetto %s, versione %s, ha una dipendenza non soddisfatta:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Impossibile trovare il pacchetto %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Totale nomi dei pacchetti : "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Pacchetti normali: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Pacchetti virtuali puri: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Pacchetti virtuali singoli: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Pacchetti virtuali misti: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Mancante: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Totale versioni distinte: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Totale versioni distinte: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Totale dipendenze: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Totale relazioni ver/file: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Totale relazioni ver/file: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Totale corrispondenze fornite: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Totale stringhe globalizzate: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Totale spazio di dipendenza di versione: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Totale spazio \"slack\": "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Totale spazio occupato: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Il file dei pacchetti %s non è sincronizzato."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Bisogna specificare un singolo pattern"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Nessun pacchetto trovato"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "File dei pacchetti:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  "La cache non è sincronizzata, impossibile referenziare un file di pacchetti"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Pacchetti con pin:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(non trovato)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Installato: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(nessuno)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Candidato: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Pin del pacchetto: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Tabella versione:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s per %s %s compilato il %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -302,7 -302,7 +312,7 @@@ msgstr "
  "  -c=? Legge come configurazione il file specificato\n"
  "  -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Impossibile scrivere in %s"
@@@ -426,128 -426,115 +436,128 @@@ msgstr "Nessuna selezione corrisponde
  msgid "Some files are missing in the package file group `%s'"
  msgstr "Mancano alcuni file nel file group di pacchetti `%s'"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "DB era corrotto, il file è stato rinominato in %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "Il DB è vecchio, tentativo di aggiornamento %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +"Il formato DB non è valido. Se avete aggiornato da una vecchia versione di "
 +"apt,rimuovete e ricreate il database."
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "Impossibile aprire il file DB %s: %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "La data del file è cambiata %s"
 +msgid "Failed to stat %s"
 +msgstr "Impossibile analizzare %s"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "L'archivio non ha un campo control"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "Impossibile ottenere un cursore"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "W: Impossibile leggere la directory %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "W: Impossibile analizzare %s\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "E: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "W: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "E: Errori applicati al file "
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "Impossibile risolvere %s"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "Visita dell'albero fallita"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "Impossibile aprire %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr " DeLink %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "Impossibile eseguire readlink su %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "Impossibile eseguire unlink su %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** Impossibile eseguire link tra %s e %s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " DeLink limite di %sB raggiunto.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "Impossibile analizzare %s"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "L'archivio non ha un campo package"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr "  %s non ha un campo override\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "  %s maintainer è %s non %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr "  %s non ha un campo source override\n"
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr "  %s non ha neppure un campo binary override\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -643,79 -630,79 +653,79 @@@ msgstr "Problema nell'unlink di %s
  msgid "Failed to rename %s to %s"
  msgstr "Impossibile rinominare %s in %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "S"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Errore di compilazione della regex - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "ma %s è installato"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "ma %s sta per essere installato"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "ma non è installabile"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "ma è un pacchetto virtuale"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "ma non è installato"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "ma non sta per essere installato"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " oppure"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "I seguenti pacchetti NUOVI (NEW) saranno installati:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "I seguenti pacchetti saranno RIMOSSI:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "I seguenti pacchetti saranno aggiornati:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "I seguenti pacchetti saranno RETROCESSI (DOWNGRADED):"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "I seguenti pacchetti bloccati saranno cambiati:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (a causa di %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -724,149 -711,149 +734,149 @@@ msgstr "
  "Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa "
  "si sta facendo!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu aggiornati, %lu installati, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu reinstallati, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu retrocessi (downgraded), "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu da rimuovere e %lu non aggiornati.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu non completamente installati o rimossi.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Correzione delle dipendenze in corso..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " fallita."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Impossibile correggere le dipendenze"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Impossibile minimizzare l'insieme da aggiornare"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Fatto"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr ""
  "È consigliabile eseguire `apt-get -f install' per correggere questi problemi."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Dipendenze non trovate. Riprovare usando -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "Avviso di autenticazione disabilitato \n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Installare questi pacchetti senza la verifica [s/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Non è stato possibile autenticare alcuni pacchetti"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Sussistono dei problemi e -y è stata usata senza --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr ""
  "Errore interno, InstallPackages è stato chiamato con un pacchetto rotto!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "I pacchetti devono essere rimossi ma il remove è disabilitato."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Errore interno, l'ordinamento non è terminato"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Impossibile creare un lock sulla directory di download"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "La lista dei sorgenti non può essere letta."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  "Che strano... le dimensioni non corrispondono, inviare un'email a "
  "apt@packages.debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "È necessario prendere %sB/%sB di archivi. \n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "È necessario prendere %sB di archivi. \n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "Dopo l'estrazione, verranno occupati %sB di spazio su disco.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Dopo l'estrazione, verranno liberati %sB di spazio su disco.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Impossibile determinare lo spazio libero su %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Lo spazio libero in %s non è sufficiente."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  "È stata specificata la modalità Trivial Only ma questa non è un'operazione "
  "triviale"
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "SI, esegui come richiesto!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -877,28 -864,28 +887,28 @@@ msgstr "
  "Per continuare scrivere la frase '%s' \n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Interrotto."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Continuare [S/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Impossibile ottenere %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Il download di alcuni file è fallito"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Download completato e in modalità download-only"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -906,49 -893,49 +916,49 @@@ msgstr "
  "Impossibile prendere alcuni archivi, forse è meglio eseguire apt-get update "
  "o provare l'opzione --fix-missing"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing su media estraibili non è ancora supportato"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Impossibile correggere i pacchetti mancanti"
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Interruzione dell'installazione in corso."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Nota, si sta selezionando %s al posto di %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  "%s è stato saltato, perché è già installato e l'aggiornamento non è stato "
  "impostato.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Il pacchetto %s non è installato, quindi non è stato rimosso\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Il pacchetto %s è un pacchetto virtuale fornito da:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Installato]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Bisogna esplicitamente sceglierne uno da installare."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -959,49 -946,49 +969,49 @@@ msgstr "
  "pacchetto. Questo significa che il pacchetto manca, è diventato obsoleto\n"
  "o è disponibile solo all'interno di un'altra sorgente\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Comunque il seguente pacchetto lo sostituisce:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Il pacchetto %s non ha candidati da installare"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "La reinstallazione di %s non è possibile, non può essere scaricato.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s è già alla versione più recente.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Non è stata trovata la release '%s' per '%s'"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Non è stata trovata la versione '%s' per '%s'"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Versione selezionata %s (%s) per %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "Il comando update non accetta argomenti"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Impossibile creare un lock sulla directory di list"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1009,26 -996,26 +1019,45 @@@ msgstr "
  "Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure "
  "si useranno quelli precedenti."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Errore interno, problem resolver ha rotto qualcosa"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Errore interno, AllUpgrade ha rotto qualcosa"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Impossibile trovare %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Nota, si sta selezionando %s per la regex '%s'\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr ""
  "È consigliabile eseguire 'apt-get -f install' per correggere questi problemi:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1036,7 -1023,7 +1065,7 @@@ msgstr "
  "Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o "
  "specificare una soluzione)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1048,7 -1035,7 +1077,7 @@@ msgstr "
  "si sta usando la distribuzione \"unstable\", che alcuni pacchetti\n"
  "richiesti non sono ancora stati creati o rimossi da incoming."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1058,121 -1045,121 +1087,117 @@@ msgstr "
  "il pacchetto semplicemente non sia installabile, si consiglia\n"
  "di inviare un \"bug report\" per tale pacchetto."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Pacchetto non integro"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "I seguenti pacchetti verranno inoltre installati:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Pacchetti suggeriti:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Pacchetti raccomandati:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Calcolo dell'aggiornamento in corso... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Fallito"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Fatto"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Errore interno, problem resolver ha rotto qualcosa"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "Bisogna specificare almeno un pacchetto di cui scaricare il sorgente"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Impossibile trovare un pacchetto sorgente per %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Si è saltato il file già scaricato '%s'\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Lo spazio libero in %s non è sufficiente"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "È necessario prendere %sB/%sB di sorgenti.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "È necessario prendere %sB di sorgenti\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Prelievo del sorgente %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Non è stato possibile scaricare alcuni archivi."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Si è saltata l'estrazione del sorgente già estratto in %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Comando di estrazione '%s' fallito.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Verificare se il pacchetto 'dpkg-dev' è installato.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Comando di costruzione '%s' fallito.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Processo figlio fallito"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "Bisogna specificare almeno un pacchetto di cui controllare la generazione di "
  "dipendenze"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Impossibile ottenere informazioni di dipendenza di costruzione per %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s non ha dipendenze di costruzione.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1181,7 -1168,7 +1206,7 @@@ msgstr "
  "%s dipendenze per %s non possono essere soddisfatte perché non si trova il "
  "pacchetto %s"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1190,32 -1177,32 +1215,32 @@@ msgstr "
  "%s dipendenze per %s non possono essere soddisfatte perché nessuna versione "
  "del pacchetto %s può soddisfare le richieste di versione"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s "
  "è troppo nuovo"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "La dipendenza %s per %s: %s è fallita"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Non è stato possibile soddisfare le dipendenze di costruzione per %s."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Il calcolo delle dipendenze per la costruzione è fallito"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Moduli supportati:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1403,19 -1390,19 +1428,19 @@@ msgstr "Aggiornamento delle informazion
  msgid "Failed to create pipes"
  msgstr "Impossibile creare delle pipe"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "Impossibile eseguire gzip "
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Archivio corrotto"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Checksum di tar fallito, archivio corrotto"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Tipo %u nell'header del tar sconosciuto, member %s"
@@@ -1562,9 -1549,9 +1587,9 @@@ msgid "The info and temp directories ne
  msgstr "Le directory temp e info devono essere sullo stesso filesystem"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Lettura della lista dei pacchetti in corso"
  
@@@ -1697,12 -1684,12 +1722,14 @@@ msgstr "Disco non trovato
  msgid "File not found"
  msgstr "File non trovato"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Impossibile analizzare"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Impossibile impostare la data di modifica (modification time)"
  
@@@ -1831,7 -1818,7 +1858,7 @@@ msgstr "Tempo limite di connessione esa
  msgid "Unable to accept connection"
  msgstr "Impossibile accettare connessioni"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Problemi nella creazione dell'hash del file"
  
@@@ -1916,42 -1903,41 +1943,42 @@@ msgstr "È accaduto qualcosa di anormal
  msgid "Unable to connect to %s %s:"
  msgstr "Impossibile connettersi a %s %s:"
  
 -#: methods/gpgv.cc:64
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:65
 +#, c-format
  msgid "Couldn't access keyring: '%s'"
 -msgstr "Impossibile risolvere '%s'"
 +msgstr "Impossibile accedere al keyring '%s'"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr ""
  "E: Lista argomento da Acquire::gpgv::Options troppo lunga. Uscita in corso."
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
  "Errore interno: Firma corretta, ma non è stato possibile determinare il "
  "fingerprint della chiave?!"
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr "Almeno una firma non valida è stata trovata."
  
 -#: methods/gpgv.cc:207
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:213
 +#, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 -msgstr " per verificare la firma (gnupg è installato?)"
 +msgstr ""
 +"Impossibile esseguire '%s' per verificare la firma (gnupg è installato?)"
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr "Errore sconosciuto durante l'esecuzione di gpgv"
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
  msgstr "Le seguenti firme non erano valide:\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
@@@ -1959,87 -1945,87 +1986,87 @@@ msgstr "
  "Le seguenti firme non sono state verificate perché la chiave pubblica non è "
  "disponibile:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Impossibile aprire una pipe per %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Errore di lettura dal processo %s"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "In attesa degli header"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Si è ottenuto una singola linea di header su %u caratteri"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Linea nell'header non corretta"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "Il server HTTP ha inviato un header di risposta non valido"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "Il server HTTP ha inviato un Content-Length non valido"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "Il server HTTP ha inviato un Content-Range non valido"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "Questo server HTTP ha il supporto del range bacato"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Formato della data sconosciuto"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Select fallito"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Tempo limite per la connessione esaurito"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Errore nella scrittura del file di output"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Errore nella scrittura nel file"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Errore nella scrittura nel file"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr ""
  "Errore nella lettura dal server. Il lato remoto ha chiuso la connessione"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Errore nella lettura dal server"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Header dei dati malformato"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Connessione fallita"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Errore interno"
  
@@@ -2052,7 -2038,7 +2079,7 @@@ msgstr "Impossibile eseguire mmap su u
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Impossibile eseguire mmap di %lu byte"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Selezione %s non trovata"
@@@ -2114,12 -2100,12 +2141,12 @@@ msgstr "Errore di sintassi %s:%u: Diret
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Errore di sintassi %s:%u: caratteri extra alla fine del file"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Errore!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Fatto"
@@@ -2253,94 -2239,94 +2280,111 @@@ msgstr "Si è verificato un problema rim
  msgid "Problem syncing the file"
  msgstr "Si è verificato un problema sincronizzando il file"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Cache dei pacchetti vuota"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Il file cache dei pacchetti è corrotto"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Il file cache dei pacchetti è in una versione incompatibile"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Questo APT non supporta il sistema di versioning '%s'"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr ""
  "Il file cache dei pacchetti è stato generato per un'architettura differente"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Dipende"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Predipende"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Consiglia"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Raccomanda"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Va in conflitto"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Sostituisce"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Rende obsoleto"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "importante"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "richiesto"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "standard"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "opzionale"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Generazione dell'albero delle dipendenze in corso"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Versioni candidate"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Generazione delle dipendenze"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Aggiornamento delle informazioni disponibili"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Impossibile aprire %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Impossibile scrivere il file %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Impossibile analizzare il file dei pacchetti %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Impossibile analizzare il file dei pacchetti %s (2)"
@@@ -2375,7 -2361,7 +2419,7 @@@ msgstr "La linea %lu in %s (dist parse
  msgid "Opening %s"
  msgstr "Apertura di %s in corso"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Linea %u troppo lunga nel source list %s."
@@@ -2411,7 -2397,7 +2455,7 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Il file indice di tipo '%s' non è supportato"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
@@@ -2419,7 -2405,7 +2463,7 @@@ msgstr "
  "Il pacchetto %s deve essere reinstallato, ma non si riesce a trovare un "
  "archivio per esso."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2427,7 -2413,7 +2471,7 @@@ msgstr "
  "Errore, pkgProblemResolver::Resolve ha generato uno stop, questo può essere "
  "causato da pacchetti bloccati "
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr "Impossibile correggere i problemi, ci sono pacchetti rotti bloccati"
  
@@@ -2444,14 -2430,14 +2488,14 @@@ msgstr "Manca la directory di archivio 
  #. only show the ETA if it makes sense
  #. two days
  #: apt-pkg/acquire.cc:823
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li (%s remaining)"
 -msgstr "Scaricamento del file %li di %li (%s rimanente)"
 +msgstr "Scaricamento file %li di %li (%s rimanente)"
  
  #: apt-pkg/acquire.cc:825
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li"
 -msgstr "Lettura della lista dei file in corso"
 +msgstr "Scaricamento file %li di %li"
  
  #: apt-pkg/acquire-worker.cc:113
  #, c-format
@@@ -2470,12 -2456,12 +2514,12 @@@ msgstr "
  "Per favore inserire il disco chiamato '%s' nel dispositivo '%s' e premere "
  "invio."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Il sistema di archiviazione (packaging) '%s' non è supportato"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti"
  
@@@ -2510,108 -2496,107 +2554,126 @@@ msgstr "Impossibile capire il tipo di p
  msgid "No priority (or zero) specified for pin"
  msgstr "Nessuna (o zero) priorità specificata per il pin"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "La cache ha un sistema incompatibile di gestione delle versioni"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Errore nell'analisi di %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Errore nell'analisi di %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Errore nell'analisi di %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Errore nell'analisi di %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Errore nell'analisi di %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Errore nell'analisi di %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Errore nell'analisi di %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Errore nell'analisi di %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Errore nell'analisi di %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  "WOW, si è ecceduto il numero massimo di nomi di pacchetti che questo APT è "
  "capace di gestire"
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  "WOW, si è ecceduto il numero massimo di versioni che questo APT è capace di "
  "gestire"
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr ""
++"WOW, si è ecceduto il numero massimo di versioni che questo APT è capace di "
++"gestire"
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  "WOW, si è ecceduto il numero massimo di dipendenze che questo APT è capace "
  "di gestire"
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Errore nell'analisi di %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Errore nell'analisi di %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  "È stato impossibile trovare %s %s mentre si processava le dipendenze dei file"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Impossibile controllare la lista dei pacchetti sorgente %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Il File Collezionato Fornisce"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "Errore di I/O nel salvataggio del cache sorgente"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "rename() fallita: %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "Somma MD5 non corrispondente"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr ""
  "Non esiste una chiave pubblica disponibile per i seguenti ID di chiave:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2621,7 -2606,7 +2683,7 @@@ msgstr "
  "che bisogna correggere manualmente l'errore. (a causa di un'architettura "
  "mancante)"
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2630,7 -2615,7 +2692,7 @@@ msgstr "
  "Non è stato possibile trovare file per il pacchetto %s. Questo significa che "
  "bisogna correggere manualmente l'errore."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
@@@ -2638,7 -2623,7 +2700,7 @@@ msgstr "
  "I file indice dei pacchetti sono corrotti. Non c'è un campo Filename: per il "
  "pacchetto %s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Le Dimensioni non corrispondono"
  
@@@ -2647,7 -2632,7 +2709,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Il blocco vendor %s non contiene dati"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2656,47 -2641,47 +2718,49 @@@ msgstr "
  "Si userà il punto di montaggio del CD-ROM %s\n"
  "Montaggio CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Identificazione in corso.. "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Etichette salvate: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Si userà il mount point del CD-ROM %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Smontaggio CD-ROM in corso\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "In attesa del disco...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Montaggio CD-ROM in corso   \n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Scansione del disco alla ricerca di file indice, in corso..\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "Trovati %i indici di pacchetto, %i indici di sorgenti e %i firme\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Questo non è un nome valido, riprovare.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2705,38 -2690,38 +2769,38 @@@ msgstr "
  "Questo disco è chiamato: \n"
  "'%s'\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Copia della lista dei pacchetti in corso..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Scrittura di una nuova lista sorgenti in corso\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Le voci lista sorgenti per questo Disco sono:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Smontaggio CD-ROM in corso..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Scritti %i record.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Scritti %i record con %i file mancanti.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Scritti %i record con %i file senza match\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr "Scritti %i record con %i file mancanti e %i file senza match\n"
@@@ -2782,26 -2767,40 +2846,33 @@@ msgid "Removed %s
  msgstr "%s rimosso"
  
  #: apt-pkg/deb/dpkgpm.cc:378
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing to completely remove %s"
 -msgstr "Preparazione alla configurazione di %s in corso"
 +msgstr "Preparazione alla rimozione totale di %s in corso"
  
  #: apt-pkg/deb/dpkgpm.cc:379
 -#, fuzzy, c-format
 +#, c-format
  msgid "Completely removed %s"
 -msgstr "Impossibile rimuovere %s"
 +msgstr "Rimozione totale completata %s"
 +
++#: methods/rred.cc:219
++#, fuzzy
++msgid "Could not patch file"
++msgstr "Impossibile aprire il file %s"
+ 
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Connessione chiusa prematuramente"
  
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
++#: apt-pkg/acquire-item.cc:1097
++#, fuzzy
++msgid "There is no public key available for the following key IDs:\n"
+ msgstr ""
++"Non esiste una chiave pubblica disponibile per i seguenti ID di chiave:\n"
+ 
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr "  %s non ha un campo override\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr "  %s non ha un campo override\n"
 -
 -#: methods/rred.cc:219
 -#, fuzzy
 -msgid "Could not patch file"
 -msgstr "Impossibile aprire il file %s"
 +#~ msgid "File date has changed %s"
 +#~ msgstr "La data del file è cambiata %s"
  
- #, fuzzy
- #~ msgid "Could not patch file"
- #~ msgstr "Impossibile aprire il file %s"
- 
  #~ msgid "Reading file list"
  #~ msgstr "Lettura della lista dei file in corso"
  
diff --combined po/ja.po
index 7da358770,0fea82dea..c88a1d2b5
--- a/po/ja.po
+++ b/po/ja.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  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: 2006-08-09 16:17+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2006-09-08 19:57+0900\n"
  "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
  "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@@ -16,145 -16,145 +16,155 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8 bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "パッケージ %s のバージョン %s には解決不可能な依存関係があります:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "パッケージ %s が見つかりません"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "パッケージ名総数: "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  通常パッケージ: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  純粋仮想パッケージ: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  単一仮想パッケージ: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  複合仮想パッケージ: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  欠落: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "個別バージョン総数: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "個別バージョン総数: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "依存関係総数: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "バージョン/ファイル関係総数: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "バージョン/ファイル関係総数: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "提供マッピング総数: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Glob 文字列の総数: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "総依存関係・バージョン容量: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "総空き容量: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "総占有容量: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Package ファイル %s が同期していません。"
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "パターンはちょうど 1 つだけ指定してください"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "パッケージが見つかりません"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "パッケージファイル:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "キャッシュが同期しておらず、パッケージファイルを相互参照できません"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Pin パッケージ:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(見つかりません)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  インストールされているバージョン: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(なし)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  候補: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  パッケージ Pin: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  バージョンテーブル:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2380 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s for %s %s コンパイル日時: %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -302,7 -302,7 +312,7 @@@ msgstr "
  "  -c=? 指定した設定ファイルを読み込む\n"
  "  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "%s に書き込めません"
@@@ -440,9 -440,7 +450,9 @@@ msgstr "DB が古いため、%s のアã
  msgid ""
  "DB format is invalid. If you upgraded from a older version of apt, please "
  "remove and re-create the database."
 -msgstr "DB フォーマットが無効です。apt の古いバージョンから更新したのであれば、データベースを削除・再作成してください。"
 +msgstr ""
 +"DB フォーマットが無効です。apt の古いバージョンから更新したのであれば、データ"
 +"ベースを削除・再作成してください。"
  
  #: ftparchive/cachedb.cc:81
  #, c-format
@@@ -643,79 -641,79 +653,79 @@@ msgstr "%s のリンク解除で問題ã
  msgid "Failed to rename %s to %s"
  msgstr "%s を %s に名前変更できませんでした"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "Y"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "正規表現の展開エラー - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "以下のパッケージには満たせない依存関係があります:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "しかし、%s はインストールされています"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "しかし、%s はインストールされようとしています"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "しかし、インストールすることができません"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "しかし、これは仮想パッケージです"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "しかし、インストールされていません"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "しかし、インストールされようとしていません"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " または"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "以下のパッケージが新たにインストールされます:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "以下のパッケージは「削除」されます:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "以下のパッケージは保留されます:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "以下のパッケージはアップグレードされます:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "以下のパッケージは「ダウングレード」されます:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "以下の変更禁止パッケージは変更されます:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (%s のため) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -723,146 -721,146 +733,146 @@@ msgstr "
  "警告: 以下の不可欠パッケージが削除されます。\n"
  "何をしようとしているか本当にわかっていない場合は、実行してはいけません!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "アップグレード: %lu 個、新規インストール: %lu 個、"
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "再インストール: %lu 個、"
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "ダウングレード: %lu 個、"
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "削除: %lu 個、保留: %lu 個。\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "依存関係を解決しています ..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " 失敗しました。"
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "依存関係を訂正できません"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "アップグレードセットを最小化できません"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " 完了"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr ""
  "これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
  "ん。"
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "未解決の依存関係があります。-f オプションを試してください。"
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "警告: 以下のパッケージは認証されていません!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "認証の警告は上書きされました。\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "検証なしにこれらのパッケージをインストールしますか [y/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "いくつかのパッケージを認証できませんでした"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。"
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "内部エラー、調整が終わっていません"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "ダウンロードディレクトリをロックできません"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2128
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "ソースのリストを読むことができません。"
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  "おっと、サイズがマッチしません。apt@packages.debian.org にメールしてください"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "%2$sB 中 %1$sB のアーカイブを取得する必要があります。\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "%sB のアーカイブを取得する必要があります。\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "展開後に追加で %sB のディスク容量が消費されます。\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "展開後に %sB のディスク容量が解放されます。\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "%s の空き領域を測定できません"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "%s に充分な空きスペースがありません。"
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。"
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Yes, do as I say!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -873,28 -871,28 +883,28 @@@ msgstr "
  "続行するには、'%s' というフレーズをタイプしてください。\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "中断しました。"
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "続行しますか [Y/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2025
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "%s の取得に失敗しました  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "いくつかのファイルの取得に失敗しました"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2034
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -902,49 -900,49 +912,49 @@@ msgstr "
  "いくつかのアーカイブが取得できません。apt-get update を実行するか --fix-"
  "missing オプションを付けて試してみてください。"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "足りないパッケージを直すことができません。"
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "インストールを中断します。"
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "注意、%2$s の代わりに %1$s を選択します\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  "すでにインストールされておりアップグレードも設定されていないため、%s をスキッ"
  "プします。\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "パッケージ %s はインストールされていないため、削除はできません\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "%s は以下のパッケージで提供されている仮想パッケージです:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [インストール済み]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "インストールするパッケージを明示的に選択する必要があります。"
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -955,49 -953,49 +965,49 @@@ msgstr "
  "おそらく、そのパッケージが見つからないか、もう古くなっているか、\n"
  "あるいは別のソースからのみしか利用できないという状況が考えられます\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "しかし、以下のパッケージで置き換えられています:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "パッケージ %s にはインストール候補がありません"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "ダウンロードできないため、%s の再インストールは不可能です。\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s はすでに最新バージョンです。\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "%3$s にはバージョン %1$s (%2$s) を選択しました\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "update コマンドは引数をとりません"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "list ディレクトリをロックできません"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1005,27 -1003,27 +1015,46 @@@ msgstr "
  "いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され"
  "るか、古いものが代わりに使われます。"
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "内部エラー、問題リゾルバが何かを破壊しました"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "内部エラー、AllUpgrade が何かを破壊しました"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "パッケージ %s が見つかりません"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr ""
  "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ"
  "ません:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1033,7 -1031,7 +1062,7 @@@ msgstr "
  "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法"
  "を明示してください)。"
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1045,7 -1043,7 +1074,7 @@@ msgstr "
  "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n"
  "動されていないことが考えられます。"
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1055,122 -1053,122 +1084,118 @@@ msgstr "
  "可能性が高いです。そのため、このパッケージへのバグレポートを送ってくだ\n"
  "さい。"
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "壊れたパッケージ"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "以下の特別パッケージがインストールされます:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1685
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "提案パッケージ:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1686
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "推奨パッケージ:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1706
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "アップグレードパッケージを検出しています ... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "失敗"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1714
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "完了"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "内部エラー、問題リゾルバが何かを破壊しました"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1887
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  "ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1917 cmdline/apt-get.cc:2146
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "%s のソースパッケージが見つかりません"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1961
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1985
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "%s に充分な空きスペースがありません"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1990
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1993
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "%sB のソースアーカイブを取得する必要があります。\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1999
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "ソース %s を取得\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2030
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "いくつかのアーカイブの取得に失敗しました。"
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2058
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2070
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "展開コマンド '%s' が失敗しました。\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2071
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr ""
  "'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2088
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "ビルドコマンド '%s' が失敗しました。\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2107
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "子プロセスが失敗しました"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2123
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2151
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "%s のビルド依存情報を取得できません"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2171
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s にはビルド依存情報が指定されていません。\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2223
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1179,7 -1177,7 +1204,7 @@@ msgstr "
  "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
  "ができません"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2275
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1188,32 -1186,32 +1213,32 @@@ msgstr "
  "入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対"
  "する %1$s の依存関係を満たすことができません"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2310
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ"
  "ケージは新しすぎます"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2335
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2349
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "%s のビルド依存関係を満たすことができませんでした。"
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2353
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "ビルド依存関係の処理に失敗しました"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2385
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "サポートされているモジュール:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2426
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1553,9 -1551,9 +1578,9 @@@ msgid "The info and temp directories ne
  msgstr "info と temp ディレクトリは同じファイルシステム上になければなりません"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "パッケージリストを読み込んでいます"
  
@@@ -1690,12 -1688,12 +1715,14 @@@ msgstr "ディスクが見つかりまã
  msgid "File not found"
  msgstr "ファイルが見つかりません"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
+ #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "状態の取得に失敗しました"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
+ #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "変更時刻の設定に失敗しました"
  
@@@ -1823,7 -1821,7 +1850,7 @@@ msgstr "データソケット接続タã
  msgid "Unable to accept connection"
  msgstr "接続を accept できません"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "ファイルのハッシュでの問題"
  
@@@ -1928,9 -1926,7 +1955,9 @@@ msgstr "少なくとも 1 つの不正ã
  #: methods/gpgv.cc:213
  #, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 -msgstr "署名を検証するための '%s' の実行ができませんでした (gnupg はインストールされていますか?)"
 +msgstr ""
 +"署名を検証するための '%s' の実行ができませんでした (gnupg はインストールされ"
 +"ていますか?)"
  
  #: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
@@@ -1946,86 -1942,86 +1973,86 @@@ msgid "
  "available:\n"
  msgstr "公開鍵を利用できないため、以下の署名は検証できませんでした:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "%s に対してパイプを開けませんでした"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "%s プロセスからの読み込みエラー"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "ヘッダの待機中です"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "%u 文字を超える 1 行のヘッダを取得しました"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "不正なヘッダ行です"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "http サーバが不正なリプライヘッダを送信してきました"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "http サーバが不正な Content-Length ヘッダを送信してきました"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "http サーバが不正な Content-Range ヘッダを送信してきました"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "http サーバのレンジサポートが壊れています"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "不明な日付フォーマットです"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "select に失敗しました"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "接続タイムアウト"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "出力ファイルへの書き込みでエラーが発生しました"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "ファイルへの書き込みでエラーが発生しました"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "ファイルへの書き込みでエラーが発生しました"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "サーバからの読み込みに失敗しました"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "不正なヘッダです"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "接続失敗"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "内部エラー"
  
@@@ -2038,7 -2034,7 +2065,7 @@@ msgstr "空のファイルを mmap でã
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "%lu バイトの mmap ができませんでした"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "選択された %s が見つかりません"
@@@ -2098,12 -2094,12 +2125,12 @@@ msgstr "文法エラー %s:%u: 未対å¿
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... エラー!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... 完了"
@@@ -2235,93 -2231,93 +2262,110 @@@ msgstr "ファイルの削除中に問é
  msgid "Problem syncing the file"
  msgstr "ファイルの同期中に問題が発生しました"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "空のパッケージキャッシュ"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "パッケージキャッシュファイルが壊れています"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "このパッケージキャッシュファイルは互換性がないバージョンです"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "この APT はバージョニングシステム '%s' をサポートしていません"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "パッケージキャッシュが異なるアーキテクチャ用に構築されています"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "依存"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "先行依存"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "提案"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "推奨"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "競合"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "置換"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "廃止"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "重要"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "要求"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "標準"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "任意"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "特別"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "依存関係ツリーを作成しています"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "候補バージョン"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "依存関係の生成"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "入手可能情報をマージしています"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "%s のオープンに失敗しました"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "ファイル %s の書き込みに失敗しました"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "パッケージファイル %s を解釈することができません (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:186
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "パッケージファイル %s を解釈することができません (2)"
@@@ -2356,7 -2352,7 +2400,7 @@@ msgstr "ソースリスト %2$s の %1$
  msgid "Opening %s"
  msgstr "%s をオープンしています"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。"
@@@ -2392,7 -2388,7 +2436,7 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "インデックスファイルのタイプ '%s' はサポートされていません"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
@@@ -2400,7 -2396,7 +2444,7 @@@ msgstr "
  "パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見"
  "つけることができませんでした。"
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2408,7 -2404,7 +2452,7 @@@ msgstr "
  "エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー"
  "ジが原因です。"
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。"
  
@@@ -2451,12 -2447,12 +2495,12 @@@ msgstr "
  "'%s' とラベルの付いたディスクをドライブ '%s' に入れて enter を押してくださ"
  "い。"
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "パッケージングシステム '%s' はサポートされていません"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "適切なパッケージシステムタイプを特定できません"
  
@@@ -2496,100 -2492,99 +2540,116 @@@ msgstr "pin タイプ %s が理解でã
  msgid "No priority (or zero) specified for pin"
  msgstr "pin で優先度 (または 0) が指定されていません"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "キャッシュに非互換なバージョニングシステムがあります"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "%s を処理中にエラーが発生しました (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "%s を処理中にエラーが発生しました (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "%s を処理中にエラーが発生しました (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "%s を処理中にエラーが発生しました (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "%s を処理中にエラーが発生しました (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "%s を処理中にエラーが発生しました (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "%s を処理中にエラーが発生しました (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "%s を処理中にエラーが発生しました (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "%s を処理中にエラーが発生しました (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr "この APT が対応している以上の数のパッケージが指定されました。"
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "この APT が対応している以上の数のバージョンが要求されました。"
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "この APT が対応している以上の数のバージョンが要求されました。"
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr "この APT が対応している以上の数の依存関係が発生しました。"
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "%s を処理中にエラーが発生しました (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "%s を処理中にエラーが発生しました (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "ソースパッケージリスト %s の状態を取得できません"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "ファイル提供情報を収集しています"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "名前の変更に失敗しました。%s (%s -> %s)"
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "MD5Sum が適合しません"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2598,7 -2593,7 +2658,7 @@@ msgstr "
  "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
  "で修正する必要があります (存在しないアーキテクチャのため)。"
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2607,7 -2602,7 +2667,7 @@@ msgstr "
  "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
  "で修正する必要があります。"
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
@@@ -2615,7 -2610,7 +2675,7 @@@ msgstr "
  "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
  "フィールドがありません。"
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "サイズが適合しません"
  
@@@ -2624,7 -2619,7 +2684,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "ベンダブロック %s はフィンガープリントを含んでいません"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2633,49 -2628,49 +2693,51 @@@ msgstr "
  "CD-ROM マウントポイント %s を使用します\n"
  "CD-ROM をマウントしています\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "確認しています.. "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "格納されたラベル: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "CD-ROM マウントポイント %s を使用します\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "CD-ROM をアンマウントしています\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "ディスクを待っています ...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "CD-ROM をマウントしています ...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "ディスクのインデックスファイルを走査しています ..\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr ""
  "%i のパッケージインデックス、%i のソースインデックス、%i の署名を見つけまし"
  "た\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "これは有効な名前ではありません。再試行してください。\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2684,38 -2679,38 +2746,38 @@@ msgstr "
  "このディスクは以下のように呼ばれます: \n"
  "'%s'\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "パッケージリストをコピーしています ..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "新しいソースリストを書き込んでいます\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "このディスクのソースリストのエントリ:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "CD-ROM をアンマウントしています ..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "%i レコードを書き込みました。\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2772,16 -2767,16 +2834,22 @@@ msgstr "%s を完全に削除する準å
  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 "途中で接続がクローズされました"
  
++#: apt-pkg/acquire-item.cc:1097
++#, fuzzy
++msgid "There is no public key available for the following key IDs:\n"
++msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n"
++
  #~ msgid "File date has changed %s"
  #~ msgstr "ファイル %s の日付が変更されています"
  
--#~ msgid "Could not patch file"
--#~ msgstr "ファイルにパッチできませんでした"
--
  #~ msgid "Reading file list"
  #~ msgstr "ファイルリストを読み込んでいます"
  
diff --combined po/ko.po
index 3e1e30c56,4b60c8e09..fa4bcffd5
--- a/po/ko.po
+++ b/po/ko.po
@@@ -5,153 -5,153 +5,163 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-05-27 13:46+0200\n"
 -"PO-Revision-Date: 2006-07-20 00:28+0900\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
 +"PO-Revision-Date: 2006-10-12 21:22-0400\n"
  "Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
  "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "%s 꾸러미의 %s 버전의 의존성이 맞지 않습니다:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "%s 꾸러미를 찾을 수 없습니다"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "전체 꾸러미 이름 : "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  일반 꾸러미: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  순수 가상 꾸러미: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  단일 가상 꾸러미: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  혼합 가상 꾸러미: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  빠짐: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "전체 구역별 버전: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "전체 구역별 버전: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "전체 의존성: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "전체 버전/파일 관계: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "전체 버전/파일 관계: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "전체 제공 매핑: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "전체 패턴 문자열: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "전체 의존성 버전 용량: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "전체 빈 용량: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "차지하는 전체 용량: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "꾸러미 파일 %s 파일이 동기화되지 않았습니다."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "정확히 한 개의 패턴을 넘겨야 합니다"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "꾸러미가 없습니다"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "꾸러미 파일:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "캐시가 동기화되지 않았습니다. 꾸러미 파일을 상호 참조할 수 없습니다"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "핀 꾸러미:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(없음)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  설치: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(없음)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  후보: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  꾸러미 핀: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  버전 테이블:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s (%s %s), 컴파일 시각 %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -298,7 -298,7 +308,7 @@@ msgstr "
  "  -c=? 설정 파일을 읽습니다\n"
  "  -o=? 임의의 옵션을 설정합니다, 예를 들어 -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "%s에 쓸 수 없습니다"
@@@ -421,130 -421,117 +431,130 @@@ msgstr "맞는 꾸러미가 없습니ë‹
  msgid "Some files are missing in the package file group `%s'"
  msgstr "`%s' 꾸러미 파일 그룹에 몇몇 파일이 빠졌습니다"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "DB가 망가졌습니다. 파일 이름을 %s.old로 바꿉니다"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "DB가 오래되었습니다. %s의 업그레이드를 시도합니다"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +"DB 형식이 잘못되었습니다. apt 예전 버전에서 업그레이드했다면, 데이터베이스를 "
 +"지우고 다시 만드십시오."
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "DB 파일, %s 파일을 열 수 없습니다: %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "%s 파일의 마지막 수정 시각이 바뀌엇습니다"
 +msgid "Failed to stat %s"
 +msgstr "%s의 정보를 읽는 데 실패했습니다"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "아카이브에 컨트롤 기록이 없습니다"
  
  # FIXME: 왠 커서??
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "커서를 가져올 수 없습니다"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "경고: %s 디렉토리를 읽을 수 없습니다\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "경고: %s의 정보를 읽을 수 없습니다\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "오류: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "경고: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "오류: 다음 파일에 적용하는 데 오류가 발생했습니다: "
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "%s의 경로를 알아내는 데 실패했습니다"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "트리에서 이동이 실패했습니다"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "%s 파일을 여는 데 실패했습니다"
  
  # FIXME: ??
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr " 링크 %s [%s] 없애기\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "%s 파일에 readlink하는 데 실패했습니다"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "%s 파일을 지우는 데 실패했습니다"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** %s 파일을 %s(으)로 링크하는 데 실패했습니다"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "%s의 정보를 읽는 데 실패했습니다"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "아카이브에 꾸러미 필드가 없습니다"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr "  %s에는 override 항목이 없습니다\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "  %s 관리자가 %s입니다 (%s 아님)\n"
  
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr "  %s에는 source override 항목이 없습니다\n"
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr "  %s에는 binary override 항목이 없습니다\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -640,79 -627,79 +650,79 @@@ msgstr "%s의 링크를 해제하는 ë
  msgid "Failed to rename %s to %s"
  msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "Y"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "정규식 컴파일 오류 - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "다음 꾸러미의 의존성이 맞지 않습니다:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "하지만 %s 꾸러미를 설치했습니다"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "하지만 %s 꾸러미를 설치할 것입니다"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "하지만 설치할 수 없습니다"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "하지만 가상 꾸러미입니다"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "하지만 설치하지 않았습니다"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "하지만 %s 꾸러미를 설치하지 않을 것입니다"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " 혹은"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "다음 새 꾸러미를 설치할 것입니다:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "다음 꾸러미를 지울 것입니다:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "다음 꾸러미를 과거 버전으로 유지합니다:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "다음 꾸러미를 업그레이드할 것입니다:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "다음 꾸러미를 다운그레이드할 것입니다:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "고정되었던 다음 꾸러미를 바꿀 것입니다:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (%s때문에) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -720,149 -707,149 +730,149 @@@ msgstr "
  "경고: 꼭 필요한 다음 꾸러미를 지우게 됩니다.\n"
  "무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu개 업그레이드, %lu개 새로 설치, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu개 다시 설치, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu개 업그레이드, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu개 지우기 및 %lu개 업그레이드 안 함.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "의존성을 바로잡는 중입니다..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " 실패."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "의존성을 바로잡을 수 없습니다"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "업그레이드 집합을 최소화할 수 없습니다"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " 완료"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr ""
  "이 상황을 바로잡으려면 `apt-get -f install'을 실행해야 할 수도 있습니다."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "경고: 다음 꾸러미를 인증할 수 없습니다!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "인증 경고를 무시합니다.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "확인하지 않고 꾸러미를 설치하시겠습니까 [y/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "인증할 수 없는 꾸러미가 있습니다"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "내부 오류. 망가진 꾸러미에서 InstallPackages를 호출했습니다!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "꾸러미를 지워야 하지만 지우기가 금지되어 있습니다."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "내려받기 디렉토리를 잠글 수 없습니다"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "소스 목록을 읽을 수 없습니다."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  "이상하게도 크기가 서로 다릅니다. apt@packages.debian.org로 이메일을 보내주십"
  "시오."
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "%s바이트/%s바이트 아카이브를 받아야 합니다.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "%s바이트 아카이브를 받아야 합니다.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "압축을 풀면 %s바이트의 디스크 공간을 더 사용하게 됩니다.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "압축을 풀면 %s바이트의 디스크 공간이 비워집니다.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "%s 안에 충분한 여유 공간이 없습니다."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  "사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 "
  "아닙니다."
  
  # 입력을 받아야 한다.  한글 입력을 못 할 수 있으므로 원문 그대로 사용.
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Yes, do as I say!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -873,28 -860,28 +883,28 @@@ msgstr "
  "계속하시려면 다음 문구를 입력하십시오: '%s'\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "중단."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "계속 하시겠습니까 [Y/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "%s 파일을 받는 데 실패했습니다  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "일부 파일을 받는 데 실패했습니다"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "내려받기를 마쳤고 내려받기 전용 모드입니다"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -902,48 -889,48 +912,48 @@@ msgstr "
  "아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-"
  "missing 옵션을 줘서 실행해야 할 것입니다."
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "빠진 꾸러미를 바로잡을 수 없습니다."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "설치를 중단합니다."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "주의, %2$s 대신에 %1$s 꾸러미를 선택합니다\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  "%s 꾸러미를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "%s 꾸러미를 설치하지 않았으므로, 지우지 않습니다\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "%s 꾸러미는 다음 꾸러미가 제공하는 가상 꾸러미입니다:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [설치함]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "설치하려면 분명하게 하나를 선택해야 합니다."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -954,49 -941,49 +964,49 @@@ msgstr "
  "해당 꾸러미가 누락되었거나 지워졌다는 뜻입니다. 아니면 또 다른 곳에서\n"
  "꾸러미를 받아와야 하는 경우일 수도 있습니다.\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "하지만 다음 꾸러미가 대체합니다:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "%s 꾸러미는 설치할 수 있는 후보가 없습니다"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "%s 꾸러미를 다시 설치하는 건 불가능합니다. 내려 받을 수 없습니다.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s 꾸러미는 이미 최신 버전입니다.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "%2$s 꾸러미의 '%1$s' 릴리즈를 찾을 수 없습니다"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "%2$s 꾸러미의 '%1$s' 버전을 찾을 수 없습니다"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "%3$s 꾸러미의 %1$s (%2$s) 버전을 선택합니다\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "update 명령은 인수를 받지 않습니다"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "목록 디렉토리를 잠글 수 없습니다"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1004,26 -991,26 +1014,45 @@@ msgstr "
  "일부 인덱스 파일을 내려받는 데 실패했습니다. 해당 파일을 무시하거나 과거의 버"
  "전을 대신 사용합니다."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "내부 오류, 문제 해결 프로그램이 사고쳤습니다"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "내부 오류, AllUpgrade때문에 망가졌습니다"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "%s 꾸러미를 찾을 수 없습니다"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:"
  
  # FIXME: specify a solution?  무슨 솔루션?
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1031,7 -1018,7 +1060,7 @@@ msgstr "
  "의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 "
  "(아니면 해결 방법을 지정하십시오)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1042,7 -1029,7 +1071,7 @@@ msgstr "
  "불안정 배포판을 사용해서 일부 필요한 꾸러미를 아직 만들지 않았거나,\n"
  "아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1051,119 -1038,119 +1080,115 @@@ msgstr "
  "한 가지 작업만을 요청하셨으므로, 아마도 이 꾸러미를 설치할 수\n"
  "없는 경우일 것이고 이 꾸러미에 버그 보고서를 제출해야 합니다."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "망가진 꾸러미"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "다음 꾸러미를 더 설치할 것입니다:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "제안하는 꾸러미:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "추천하는 꾸러미:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "업그레이드를 계산하는 중입니다... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "실패"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "완료"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "내부 오류, 문제 해결 프로그램이 사고쳤습니다"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "해당되는 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "%s의 소스 꾸러미를 찾을 수 없습니다"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "%s에 충분한 공간이 없습니다"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "%s 소스를 가져옵니다\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "일부 아카이브를 가져오는 데 실패했습니다."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "압축 풀기 명령 '%s' 실패.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "'dpkg-dev' 꾸러미가 설치되었는지를 확인해주십시오.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "빌드 명령 '%s' 실패.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "하위 프로세스가 실패했습니다"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr "해당되는 빌드 의존성을 검사할 꾸러미를 최소한 하나 지정해야 합니다"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1172,7 -1159,7 +1197,7 @@@ msgstr "
  "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니"
  "다"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1181,32 -1168,32 +1206,32 @@@ msgstr "
  "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버"
  "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 꾸러미가 너"
  "무 최근 버전입니다"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "빌드 의존성을 처리하는 데 실패했습니다"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "지원하는 모듈:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1386,19 -1373,19 +1411,19 @@@ msgstr "이용 가능 꾸러미 정보ë
  msgid "Failed to create pipes"
  msgstr "파이프 만들기가 실패했습니다"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "gzip 실행이 실패했습니다"
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "아카이브가 손상되었습니다"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "tar 체크섬 실패, 아카이브가 손상되었습니다"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "알 수 없는 TAR 헤더 타입 %u, 멤버 %s"
@@@ -1543,9 -1530,9 +1568,9 @@@ msgid "The info and temp directories ne
  msgstr "정보 디렉토리와 임시 디렉토리는 같은 파일 시스템에 있어야 합니다"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "꾸러미 목록을 읽는 중입니다"
  
@@@ -1671,18 -1658,18 +1696,20 @@@ msgstr "%s 안의 CD-ROM을 마운트 í
  
  #: methods/cdrom.cc:169
  msgid "Disk not found."
 -msgstr "디스크가 없습니다"
 +msgstr "디스크가 없습니다."
  
  #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
  msgid "File not found"
  msgstr "파일이 없습니다"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "파일 정보를 읽는 데 실패했습니다"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "파일 변경 시각을 설정하는 데 실패했습니다"
  
@@@ -1810,7 -1797,7 +1837,7 @@@ msgstr "데이터 소켓 연결 시간 
  msgid "Unable to accept connection"
  msgstr "연결을 받을 수 없습니다"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "파일 해싱에 문제가 있습니다"
  
@@@ -1894,123 -1881,123 +1921,123 @@@ msgstr "'%s:%s'의 주소를 알아내ë
  msgid "Unable to connect to %s %s:"
  msgstr "%s %s에 연결할 수 없습니다:"
  
 -#: methods/gpgv.cc:64
 +#: methods/gpgv.cc:65
  #, c-format
  msgid "Couldn't access keyring: '%s'"
  msgstr "키링에 접근할 수 없습니다: '%s'"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr "E: Acquire::gpgv::Options의 인자 목록이 너무 깁니다. 종료하는 중."
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr "내부 오류: 서명은 올바르지만 키 지문을 확인할 수 없습니다!"
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr "최소한 하나 이상의 서명이 잘못되었습니다."
  
 -#: methods/gpgv.cc:207
 +#: methods/gpgv.cc:213
  #, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 -msgstr "서명을 인증하기 위한 '%s'를 실행할 수 없습니다(gnupg가 설치됐나요?)"
 +msgstr "서명을 인증하기 위한 '%s' 실행할 수 없습니다(gnupg가 설치됐나요?)"
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr "gpgv 실행 도중 알 수 없는 오류 발생"
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
  msgstr "다음 서명이 올바르지 않습니다:\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
  msgstr "다음 서명들은 공개키가 없기 때문에 인증할 수 없습니다:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "%s에 대한 파이프를 열 수 없습니다"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "헤더를 기다리는 중입니다"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "헤더 줄이 잘못되었습니다"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "데이터 형식을 알 수 없습니다"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "select가 실패했습니다"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "연결 시간이 초과했습니다"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "출력 파일에 쓰는 데 오류가 발생했습니다"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "파일에 쓰는 데 오류가 발생했습니다"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "해당 파일에 쓰는 데 오류가 발생했습니다"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "서버에서 읽는 데 오류가 발생했습니다"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "헤더 데이터가 잘못되었습니다"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "연결이 실패했습니다"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "내부 오류"
  
@@@ -2023,7 -2010,7 +2050,7 @@@ msgstr "빈 파일에 mmap할 수 없ìŠ
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "%lu바이트를 mmap할 수 없습니다"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "선택한 %s이(가) 없습니다"
@@@ -2083,12 -2070,12 +2110,12 @@@ msgstr "문법 오류 %s:%u: 지원하ì
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... 오류!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... 완료"
@@@ -2220,93 -2207,93 +2247,110 @@@ msgstr "파일을 지우는 데 문제ê
  msgid "Problem syncing the file"
  msgstr "파일을 동기화하는 데 문제가 있습니다"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "꾸러미 캐시가 비어 있습니다"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "꾸러미 캐시 파일이 손상되었습니다"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "꾸러미 캐시 파일이 호환되지 않는 버전입니다"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "이 APT는 Version System '%s'을(를) 지원하지 않습니다"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "꾸러미 캐시가 다른 아키텍쳐용입니다."
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "의존"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "선의존"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "제안"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "추천"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "충돌"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "대체"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "없앰"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "중요"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "필수"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "표준"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "옵션"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "별도"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "의존성 트리를 만드는 중입니다"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "후보 버전"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "의존성 만들기"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "이용 가능 꾸러미 정보를 합칩니다"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "%s 파일을 여는 데 실패했습니다"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "%s 파일을 쓰는 데 실패했습니다"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "꾸러미 파일 %s 파일을 파싱할 수 없습니다 (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "꾸러미 파일 %s 파일을 파싱할 수 없습니다 (2)"
@@@ -2341,7 -2328,7 +2385,7 @@@ msgstr "소스 리스트 %2$s의 %1$luë
  msgid "Opening %s"
  msgstr "%s 파일을 여는 중입니다"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다."
@@@ -2377,14 -2364,14 +2421,14 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  "%s 꾸러미를 다시 설치해야 하지만, 이 꾸러미의 아카이브를 찾을 수 없습니다."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2392,7 -2379,7 +2436,7 @@@ msgstr "
  "오류, pkgProblemResolver::Resolve가 망가졌습니다, 고정 꾸러미때문에 발생할 수"
  "도 있습니다."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr "문제를 바로잡을 수 없습니다, 망가진 고정 꾸러미가 있습니다."
  
@@@ -2432,14 -2419,14 +2476,14 @@@ msgstr "설치 방법 %s이(가) 올바
  #, c-format
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr ""
 -"'%2$s' 드라이브에 '%1$s'로 표기된 디스크를 삽입하고 엔터를 눌러주십시오."
 +"'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 삽입하고 엔터를 눌러주십시오."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "꾸러미 시스템 '%s'을(를) 지원하지 않습니다"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "올바른 꾸러미 시스템 타입을 알아낼 수 없습니다"
  
@@@ -2473,100 -2460,99 +2517,116 @@@ msgstr "핀 타입 %s이(가0 무엇인
  msgid "No priority (or zero) specified for pin"
  msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "캐시의 버전 시스템이 호환되지 않습니다"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
 -msgstr "와우, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다."
 +msgstr "우와, 이 APT가 처리할 수 있는 꾸러미 이름 개수를 넘어갔습니다."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
 -msgstr "와우, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
 +msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
 +
- #: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
+ 
 -#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 -msgstr "와우, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다."
 +msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "%s 처리중에 오류가 발생했습니다 (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "%s 처리중에 오류가 발생했습니다 (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "파일 의존성을 처리하는 데, %s %s 꾸러미가 없습니다"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "소스 꾸러미 목록 %s의 정보를 읽을 수 없습니다"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "파일에서 제공하는 것을 모으는 중입니다"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "MD5Sum이 맞지 않습니다"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr "다음 키 ID의 공개키가 없습니다:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2575,7 -2561,7 +2635,7 @@@ msgstr "
  "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
  "니다. (아키텍쳐가 빠졌기 때문입니다)"
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2584,14 -2570,14 +2644,14 @@@ msgstr "
  "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
  "니다."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  "꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "크기가 맞지 않습니다"
  
@@@ -2600,7 -2586,7 +2660,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "벤더 블럭 %s의 핑거프린트가 없습니다"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2609,47 -2595,47 +2669,49 @@@ msgstr "
  "CD-ROM 마운트 위치로 %s 사용\n"
  "CD-ROM을 마운트하는 중입니다\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "알아보는 중입니다.. "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "저장된 레이블: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "CD-ROM 마운트 위치 %s 사용\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "CD-ROM 마운트 해제하는 중입니다\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "디스크를 기다리는 중입니다...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "CD-ROM 마운트하는 중입니다...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "디스크에서 색인 파일을 찾는 중입니다...\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "꾸러미 색인 %i개, 소스 색인 %i개, 시그너처 %i개 발견\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "올바른 이름이 아닙니다. 다시 시도하십시오.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2658,38 -2644,38 +2720,38 @@@ msgstr "
  "이 디스크는 다음과 같습니다: \n"
  "'%s'\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "꾸러미 목록을 복사하는 중입니다..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "새 소스 리스트를 쓰는 중입니다\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "CD-ROM을 마운트 해제하는 중입니다..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "레코드 %i개를 썼습니다.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n"
@@@ -2744,20 -2730,35 +2806,26 @@@ msgstr "%s을(를) 완전히 지울 준
  msgid "Completely removed %s"
  msgstr "%s을(를) 완전히 지웠습니다"
  
++#: methods/rred.cc:219
++#, fuzzy
++msgid "Could not patch file"
++msgstr "%s 파일을 열 수 없습니다"
++
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "연결이 너무 빨리 끊어졌습니다"
  
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
 -msgstr ""
 -
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr "  %s에는 override 항목이 없습니다\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr "  %s에는 override 항목이 없습니다\n"
 -
 -#: methods/rred.cc:219
++#: apt-pkg/acquire-item.cc:1097
+ #, fuzzy
 -msgid "Could not patch file"
 -msgstr "%s 파일을 열 수 없습니다"
++msgid "There is no public key available for the following key IDs:\n"
++msgstr "다음 키 ID의 공개키가 없습니다:\n"
++
 +#~ msgid "File date has changed %s"
 +#~ msgstr "%s 파일의 마지막 수정 시각이 바뀌엇습니다"
  
- #, fuzzy
- #~ msgid "Could not patch file"
- #~ msgstr "%s 파일을 열 수 없습니다"
- 
  #~ msgid "Reading file list"
  #~ msgstr "파일 목록을 읽는 중"
  
  #, fuzzy
  #~ msgid "Could not execute "
  #~ msgstr "%s 잠금 파일을 얻을 수 없습니다"
 -
diff --combined po/nb.po
index 16f7c0b2c,2221d7b57..11bc9aa46
--- a/po/nb.po
+++ b/po/nb.po
@@@ -1,5 -1,9 +1,5 @@@
 -# translation of apt.po to Norsk Bokmål
 -# translation of apt.po to Norwegian
 -# translation of apt.po to Norwegian Bokmål
 -# translation of apt.po to Norwegian bokmål
 -# Norsk bokmålsoversettelse av meldinger i APT."
 -# Copyright © 2002, 2003 Lars Bahner, Axel Bojer, Hans Fredrik Nordhaug
 +# Norsk bokmalsoversettelse av meldinger i APT."
 +# Copyright 2002, 2003 Lars Bahner, Axel Bojer, Hans Fredrik Nordhaug
  # Filen utgis under Gnu Public License version 2.
  # Lisensen er tilgjenglig fra http://www.gnu.org/licenses/gpl.txt
  # Lars Bahner <bahner@debian.org>, 2002-2003.
@@@ -9,161 -13,161 +9,171 @@@
  # Klaus Ade Johnstad <klaus@skolelinux.no>, 2004.
  # Axel Bojer <axelb@skolelinux.no>, 2004.
  # Bjorn Steensrud <bjornst@powertech.no>, 2004.
 -# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2005.
 +# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2005-2006.
  #
  msgid ""
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-05-27 13:46+0200\n"
 -"PO-Revision-Date: 2005-02-09 10:45+0100\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
 +"PO-Revision-Date: 2006-10-16 00:35+0100\n"
  "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 -"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
 +"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=ISO-8859-1\n"
  "Content-Transfer-Encoding: 8bit\n"
  "X-Generator: KBabel 1.9.1\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Pakken %s versjon %s har et uinnfridd avhengighetsforhold:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Klarer ikke å finne pakken %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Plassmengde pakkenavn: "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Vanlige pakker: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Rent virtuelle pakker: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Enkle virtuelle pakker: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Sammensatte virtuelle pakker: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Mangler: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Antall unike versjoner: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Antall unike versjoner: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Antall avhengighetsforhold: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Antall forhold versjon/fil: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Antall forhold versjon/fil: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Antall tilbudte tilknyttinger: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Antall utvidede strenger: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Total plass for avhengighetsforhold/versjoner: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Plass brukt av slark: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Samlet mengde redegjort plass: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Pakkefila %s er ikke oppdatert."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Du må oppgi nøyaktig ett mønster"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Fant ingen pakker"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Pakkefiler:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  "Mellomlageret er ikke oppdatert, kan ikke kryssreferere til en pakkefil"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Låste pakker:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(ikke funnet)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Installert: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(ingen)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Kandidat: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Pakke låst til: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Versjonstabell:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s for %s %s kompilert på %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -240,15 -244,19 +250,15 @@@ msgstr "
  
  #: cmdline/apt-cdrom.cc:78
  msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
 -msgstr ""
 +msgstr "Oppgi et navn for disken, eksempelvis «Debian 2.1r1 disk 1»"
  
  #: cmdline/apt-cdrom.cc:93
 -#, fuzzy
  msgid "Please insert a Disc in the drive and press enter"
 -msgstr ""
 -"Bytte av media: sett inn CD-en som er merket\n"
 -"  «%s»\n"
 -"i «%s» og trykk «Enter»\n"
 +msgstr "Sett inn en disk i lagringsenheten og trykk Enter"
  
  #: cmdline/apt-cdrom.cc:117
  msgid "Repeat this process for the rest of the CDs in your set."
 -msgstr ""
 +msgstr "Gjenta denne prosessen for resten av CD-ene i ditt sett."
  
  #: cmdline/apt-config.cc:41
  msgid "Arguments not in pairs"
@@@ -312,7 -320,7 +322,7 @@@ msgstr "
  "  -c=? Les denne innstillingsfila.\n"
  "  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Kan ikke skrive til %s"
@@@ -346,6 -354,7 +356,6 @@@ msgid "Error processing contents %s
  msgstr "Det oppsto en feil ved lesing av %s"
  
  #: ftparchive/apt-ftparchive.cc:556
 -#, fuzzy
  msgid ""
  "Usage: apt-ftparchive [options] command\n"
  "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@@ -436,128 -445,115 +446,128 @@@ msgstr "Ingen utvalg passet
  msgid "Some files are missing in the package file group `%s'"
  msgstr "Enkelte filer mangler i pakkegruppa «%s»"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "Databasen er ødelagt. Filnavnet er endret til %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "Databasen er gammel, forsøker å oppgradere %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +"DB-formatet er ugyldig. Hvis du oppgraderte fra en eldre versjon av apt, "
 +"fjern og så gjenopprett databasen."
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "Klarte ikke å åpne Databasefila %s: %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "Fildatoen er endret %s"
 +msgid "Failed to stat %s"
 +msgstr "Klarte ikke å få statusen på %s"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "Arkivet har ingen kontrollpost"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "Klarte ikke å finne en peker"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "A: Klarte ikke å lese katalogen %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "A: Klarte ikke å få statusen på %s\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "F:"
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "A:"
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "F: Det er feil ved fila"
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "Klarte ikke å slå opp %s"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "Klarte ikke å finne fram i treet"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "Klarte ikke å åpne %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr " DeLink %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "Klarte ikke å lese lenken %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "Klarte ikke å oppheve lenken %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** Klarte ikke å lenke %s til %s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " DeLink-grensa på %s B er nådd.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "Klarte ikke å få statusen på %s"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "Arkivet har ikke noe pakkefelt"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr "  %s har ingen overstyringsoppføring\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr " %s-vedlikeholderen er %s, ikke %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr "  %s har ingen kildeoverstyringsoppføring\n"
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr "  %s har ingen binæroverstyringsoppføring heller\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -653,258 -649,258 +663,258 @@@ msgstr "Problem ved oppheving av lenke
  msgid "Failed to rename %s to %s"
  msgstr "Klarte ikke å endre navnet på %s til %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "J"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Kompileringsfeil i regulært uttrykk - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "men %s er installert"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "men %s skal installeres"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "men lar seg ikke installere"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "men er en virtuell pakke"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "men er ikke installert"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "men skal ikke installeres"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " eller"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Følgende NYE pakker vil bli installert:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Følgende pakker vil bli FJERNET:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Følgende pakker er holdt tilbake:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Følgende pakker vil bli oppgradert:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Følgende pakker vil bli NEDGRADERT:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Følgende pakker vil bli endret:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (pga. %s) "
  
--#: cmdline/apt-get.cc:546
 -#, fuzzy
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
  msgstr ""
 -"ADVARSEL: Følgende kjernepakker vil bli fjernet\n"
 +"ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n"
  "Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu oppgraderte, %lu nylig installerte, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu installert på nytt, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu nedgraderte, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Retter på avhengighetsforhold ..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " mislyktes."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Klarer ikke å rette på avhengighetsforholdene"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Klarer ikke å minimere oppgraderingsettet"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Utført"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "Du vil kanskje kjøre «apt-get -f install» for å rette på dette."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
 -msgstr ""
 +msgstr "Autentiseringsadvarsel overstyrt.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Installer disse pakkene uten verifikasjon [j/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Noen pakker ble ikke autentisert"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
 -msgstr ""
 +msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Pakker trenges å fjernes, men funksjonen er slått av."
  
--#: cmdline/apt-get.cc:775
 -#, fuzzy
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
 -msgstr "Det oppsto en intern feil når avledningen ble lagt til"
 +msgstr "Intern feil, sortering fullførte ikke"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Klarer ikke å låse nedlastingsmappa"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Kan ikke lese kildlista."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
 +"Så rart ... Størrelsene stemmer ikke overens, send en e-post til "
 +"apt@packages.debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Må hente %sB/%sB med arkiver.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Må hente %sB med arkiver.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "Etter utpakking vil %sB ekstra diskplass bli brukt.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Etter utpakking vil %sB diskplass bli ledig.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 -#, fuzzy, c-format
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
 +#, c-format
  msgid "Couldn't determine free space in %s"
 -msgstr "Du har ikke nok ledig plass i %s"
 +msgstr "Klarte ikke bestemme ledig plass i %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Dessverre, ikke nok ledig plass i %s"
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  "«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Ja, gjør som jeg sier!"
  
--#: cmdline/apt-get.cc:868
 -#, fuzzy, c-format
++#: cmdline/apt-get.cc:883
 +#, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
  "To continue type in the phrase '%s'\n"
  " ?] "
  msgstr ""
  "Du er iferd med å utføre en mulig skadelig handling.\n"
 -"For å fortsette, skriv: «%s»\n"
 +"For å fortsette skriv inn teksten «%s»\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Avbryter."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Vil du fortsette [Y/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Klarte ikke å skaffe %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Noen av filene kunne ikke lastes ned"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Nedlasting fullført med innstillinga «bare nedlasting»"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -912,48 -908,48 +922,48 @@@ msgstr "
  "Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller "
  "«--fix-missing»."
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "«--fix-missing» og bytte av media støttes nå ikke"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Klarer ikke å rette på manglende pakker."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Avbryter istallasjonen."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Merk, velger %s istedenfor %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  "Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Installert]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Du må velge en pakke som skal installeres."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -964,49 -960,49 +974,49 @@@ msgstr "
  "Dette kan bety at pakken mangler, er utgått, eller bare finnes \n"
  "tilgjengelig fra en annen kilde.\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Følgende pakker erstatter den imidlertid:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Pakken %s har ingen installasjonskandidat"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s er allerede nyeste versjon.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Utgave «%s» av «%s» ble ikke funnet"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Versjon «%s» av «%s» ble ikke funnet"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Utvalgt versjon %s (%s) for %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "Oppdaterings-kommandoen tar ingen argumenter"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Kan ikke låse listemappa"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1014,25 -1010,25 +1024,44 @@@ msgstr "
  "Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
  "ble brukt isteden. "
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Intern feil, problemløser ødela noe"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Intern feil - «AllUpgrade» ødela noe"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Klarte ikke å finne pakken %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Merk, velger %s istedenfor det regulære uttrykket «%s»\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1040,7 -1036,7 +1069,7 @@@ msgstr "
  "Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller "
  "angi en løsning)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1052,7 -1048,7 +1081,7 @@@ msgstr "
  "at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n"
  "distribusjonen."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1062,126 -1058,127 +1091,122 @@@ msgstr "
  "at pakken helt enkelt ikke kan installeres, og du bør fylle ut en "
  "feilmelding."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Ødelagte pakker"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Følgende ekstra pakker vil bli installert."
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Foreslåtte pakker:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Anbefalte pakker"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Beregner oppgradering... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Mislyktes"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Utført"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 -#, fuzzy
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
 -msgstr "Intern feil - «AllUpgrade» ødela noe"
 +msgstr "Intern feil, problemløser ødela noe"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "Du må angi minst en pakke du vil ha kildekoden til"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Klarer ikke å finne en kildekodepakke for %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
 -#, fuzzy, c-format
++#: cmdline/apt-get.cc:2043
 +#, c-format
  msgid "Skipping already downloaded file '%s'\n"
 -msgstr "Omgår utpakking av allerede utpakket kilde i %s\n"
 +msgstr "Hopper over allerede nedlastet fil «%s»\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Du har ikke nok ledig plass i %s"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Skaffer kildekode %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Klarte ikke å skaffe alle arkivene."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Omgår utpakking av allerede utpakket kilde i %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
 -msgstr ""
 +msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Byggekommandoen «%s» mislyktes.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Barneprosessen mislyktes"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr "Du må angi minst en pakke du vil sjekke «builddeps» for"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Klarer ikke å skaffe informasjon om bygge-avhengighetene for %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s har ingen avhengigheter.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1190,32 -1187,32 +1215,32 @@@ msgstr "
  "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige "
  "versjoner av pakken %s som oppfyller versjonskravene"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken %"
  "s er for ny"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Klarte ikke å behandle forutsetningene for bygging"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Støttede moduler:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1397,19 -1394,19 +1422,19 @@@ msgstr "Fletter tilgjengelig informasjo
  msgid "Failed to create pipes"
  msgstr "Klarte ikke å opprette rør"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "Klarte ikke å kjøre gzip "
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Ødelagt arkiv"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Ukjent TAR-hode: type %u, medlem %s"
@@@ -1466,7 -1463,7 +1491,7 @@@ msgid "Duplicate conf file %s/%s
  msgstr "Dobbel oppsettsfil %s/%s"
  
  #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
 -#, fuzzy, c-format
 +#, c-format
  msgid "Failed to write file %s"
  msgstr "Klarte ikke å skrive fila %s"
  
@@@ -1555,9 -1552,9 +1580,9 @@@ msgstr "
  "Infokatalogen og den midlertidige katalogen må være på det samme filsystemet"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Leser pakkelister"
  
@@@ -1686,19 -1683,20 +1711,21 @@@ msgstr "
  "bruk."
  
  #: methods/cdrom.cc:169
 -#, fuzzy
  msgid "Disk not found."
 -msgstr "Fant ikke fila"
 +msgstr "Disk ikke funnet."
  
  #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
  msgid "File not found"
  msgstr "Fant ikke fila"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Klarte ikke å få status"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Klarte ikke å sette endringstidspunkt"
  
@@@ -1826,7 -1824,7 +1853,7 @@@ msgstr "Tidsavbrudd på tilkoblingen ti
  msgid "Unable to accept connection"
  msgstr "Klarte ikke å godta tilkoblingen"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Problem ved oppretting av nøkkel for fil"
  
@@@ -1910,126 -1908,124 +1937,126 @@@ msgstr "Noe galt skjedde ved oppslag a
  msgid "Unable to connect to %s %s:"
  msgstr "Klarte ikke å koble til %s %s:"
  
 -#: methods/gpgv.cc:64
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:65
 +#, c-format
  msgid "Couldn't access keyring: '%s'"
 -msgstr "Klarte ikke å slå opp «%s»"
 +msgstr "Klarte ikke å slå opp i nøkkelring; «%s»"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 -msgstr ""
 +msgstr "E: Argumentliste fra Acquire::gpgv::Options for lang. Avbryter."
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
 -msgstr ""
 +msgstr "Intern feil: God signatur, men kunne bestemme nøkkelfingeravtrykk?!"
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
 -msgstr ""
 +msgstr "Minst en ugyldig signatur ble funnet."
  
 -#: methods/gpgv.cc:207
 +#: methods/gpgv.cc:213
  #, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
  msgstr ""
 +"Klarte ikke kjøre «%s» for å verifisere signaturen (er gnupg installert?)"
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
 -msgstr ""
 +msgstr "Ukjent feil ved kjøring av gpgv"
  
 -#: methods/gpgv.cc:243
 -#, fuzzy
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
 -msgstr "Følgende ekstra pakker vil bli installert."
 +msgstr "De følgende signaturene var ugyldige:\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
  msgstr ""
 +"De følgende signaturene kunne ikke verifiseres fordi den offentlige nøkkelen "
 +"ikke er tilgjengelig:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Klarte ikke å åpne rør for %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Lesefeil fra %s-prosessen"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Venter på hoder"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Fikk en enkel hodelinje over %u tegn"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Ødelagt hodelinje"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "HTTP-tjeneren sendte et ugyldig svarhode"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "HTTP-tjeneren sendte et ugyldig «Content-Length»-hode"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "HTTP-tjeneren sendte et ugyldig «Content-Range»-hode"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "Denne HTTP-tjeneren har ødelagt støtte for område"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Ukjent datoformat"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Utvalget mislykkes"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Tidsavbrudd på forbindelsen"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Feil ved skriving til utfil"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Feil ved skriving til fil"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Feil ved skriving til fila"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Feil ved lesing fra tjeneren"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Ødelagte hodedata"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Forbindelsen mislykkes"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Intern feil"
  
@@@ -2042,7 -2038,7 +2069,7 @@@ msgstr "Kan ikke utføre mmap på en tom 
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Kunne ikke lage mmap av %lu bytes"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Fant ikke utvalget %s"
@@@ -2102,12 -2098,12 +2129,12 @@@ msgstr "Syntaksfeil %s:%u: Direktivet «
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Syntaksfeil %s:%u: Ugyldige angivelser på slutten av fila"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s ... Feil"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s ... Ferdig"
@@@ -2239,93 -2235,93 +2266,110 @@@ msgstr "Problem ved oppheving av lenke 
  msgid "Problem syncing the file"
  msgstr "Problem ved oppdatering av fila"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Tomt pakkelager"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Pakkens lagerfil er ødelagt"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Pakkens lagerfil er av feil versjon (samvirker ikke)"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Denne APT støtter ikke versjonssystemet «%s»"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "Pakkelageret ble bygd for en annen arkitektur"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Avhenger av"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Forutsetter"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Foreslår"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Anbefaler"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Er i konflikt med"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Erstatter"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Nuller"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "viktig"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "påkrevet"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "vanlig"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "valgfri"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "tillegg"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Skaper oversikt over avhengighetsforhold"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Versjons-kandidater"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Oppretter avhengighetsforhold"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Fletter tilgjengelig informasjon"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Klarte ikke å åpne %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Klarte ikke å skrive fila %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Klarer ikke å fortolke pakkefila %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Klarer ikke å fortolke pakkefila %s (2)"
@@@ -2360,7 -2356,7 +2404,7 @@@ msgstr "Feil på %lu i kildelista %s (di
  msgid "Opening %s"
  msgstr "Åpner %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Linje %u i kildelista %s er for lang"
@@@ -2371,7 -2367,7 +2415,7 @@@ msgid "Malformed line %u in source lis
  msgstr "Feil på %u i kildelista %s (type)"
  
  #: apt-pkg/sourcelist.cc:244
 -#, fuzzy, c-format
 +#, c-format
  msgid "Type '%s' is not known on line %u in source list %s"
  msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
  
@@@ -2396,14 -2392,14 +2440,14 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Oversiktsfil av typen «%s» støttes ikke"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  "Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2411,7 -2407,7 +2455,7 @@@ msgstr "
  "Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker "
  "som holdes tilbake."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake."
  
@@@ -2430,12 -2426,12 +2474,12 @@@ msgstr "Arkivmappa %spartial mangler.
  #: apt-pkg/acquire.cc:823
  #, c-format
  msgid "Retrieving file %li of %li (%s remaining)"
 -msgstr ""
 +msgstr "Henter fil %li av %li (%s gjenværende)"
  
  #: apt-pkg/acquire.cc:825
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li"
 -msgstr "Les filliste"
 +msgstr "Henter fil %li av %li"
  
  #: apt-pkg/acquire-worker.cc:113
  #, c-format
@@@ -2448,16 -2444,19 +2492,16 @@@ msgid "Method %s did not start correctl
  msgstr "Metoden %s startet ikke korrekt"
  
  #: apt-pkg/acquire-worker.cc:377
 -#, fuzzy, c-format
 +#, c-format
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 -msgstr ""
 -"Bytte av media: sett inn CD-en som er merket\n"
 -"  «%s»\n"
 -"i «%s» og trykk «Enter»\n"
 +msgstr "Sett inn disken merket «%s» i lagringsenheten «%s» og trykk Enter."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Pakkesystemet «%s» støttes ikke"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Klarer ikke bestemme en passende pakkesystemtype"
  
@@@ -2493,101 -2492,99 +2537,117 @@@ msgstr "Forsto ikke spikring av typen %
  msgid "No priority (or zero) specified for pin"
  msgstr "Ingen prioritet (eller null) spesifisert for pin"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Lageret har et uoverensstemmende versjonssystem"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Feil oppsto under behandling av %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Feil oppsto under behandling av %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Feil oppsto under behandling av %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Feil oppsto under behandling av %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Feil oppsto under behandling av %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Feil oppsto under behandling av %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Feil oppsto under behandling av %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Feil oppsto under behandling av %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Feil oppsto under behandling av %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr "Jøss, du har overgått antallet pakkenavn denne APT klarer."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "Jøss, du har overgått antallet versjoner denne APT klarer."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "Jøss, du har overgått antallet versjoner denne APT klarer."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr "Jøss, du har overgått antallet avhengighetsforhold denne APT klarer."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Feil oppsto under behandling av %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Feil oppsto under behandling av %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "Fant ikke pakken %s %s ved behandling av filkrav"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Samler inn filtilbud"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "IO-feil ved lagring av kildekode-lager"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "klarte ikke å endre navnet, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "Feil MD5sum"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr ""
 +"Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2596,7 -2593,7 +2656,7 @@@ msgstr "
  "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken "
  "selv (fordi arkitekturen mangler)."
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2605,13 -2602,13 +2665,13 @@@ msgstr "
  "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne denne "
  "pakken selv."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr "Oversiktsfilene er ødelagte. Feltet «Filename:» mangler for pakken %s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Feil størrelse"
  
@@@ -2620,7 -2617,7 +2680,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Utgivers blokk %s inneholder ikke no fingeravtrykk"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2629,47 -2626,47 +2689,49 @@@ msgstr "
  "Bruker CD-ROM monteringspunkt %s\n"
  "Monterer CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Indentifiserer.."
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Lagret merkelapp: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Bruker CD-ROM monteringspunkt %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Avmonterer CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Venter på CD-en...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Monterer CD-ROM...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Leter gjennom CD for indeksfiler..\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "Fant %i pakkeindekser, %i kildeindekser og %i signaturer\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Det er ikke et gyldig navn, prøv igjen.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2678,103 -2675,117 +2740,110 @@@ msgstr "
  "CD-en er kalt: \n"
  "«%s»\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Kopierer pakkelister..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Skriver ny kildeliste\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Kildelisteoppføringer for denne CD-en er:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Avmonterer CD-ROM..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Skrev %i poster.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Skrev %i poster med %i manglende filer.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Skrev %i poster med %i feile filer.\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n"
  
  #: apt-pkg/deb/dpkgpm.cc:358
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing %s"
 -msgstr "Åpner %s"
 +msgstr "Forbereder %s"
  
  #: apt-pkg/deb/dpkgpm.cc:359
 -#, fuzzy, c-format
 +#, c-format
  msgid "Unpacking %s"
 -msgstr "Åpner %s"
 +msgstr "Pakker ut %s"
  
  #: apt-pkg/deb/dpkgpm.cc:364
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing to configure %s"
 -msgstr "Åpner oppsettsfila %s"
 +msgstr "Forbereder konfigurering %s"
  
  #: apt-pkg/deb/dpkgpm.cc:365
 -#, fuzzy, c-format
 +#, c-format
  msgid "Configuring %s"
 -msgstr "Kobler til %s"
 +msgstr "Konfigurer %s"
  
  #: apt-pkg/deb/dpkgpm.cc:366
 -#, fuzzy, c-format
 +#, c-format
  msgid "Installed %s"
 -msgstr "  Installert: "
 +msgstr "Installerte %s"
  
  #: apt-pkg/deb/dpkgpm.cc:371
  #, c-format
  msgid "Preparing for removal of %s"
 -msgstr ""
 +msgstr "Forbereder fjerning av %s"
  
  #: apt-pkg/deb/dpkgpm.cc:372
 -#, fuzzy, c-format
 +#, c-format
  msgid "Removing %s"
 -msgstr "Åpner %s"
 +msgstr "Fjerner %s"
  
  #: apt-pkg/deb/dpkgpm.cc:373
 -#, fuzzy, c-format
 +#, c-format
  msgid "Removed %s"
 -msgstr "Anbefaler"
 +msgstr "Fjernet %s"
  
  #: apt-pkg/deb/dpkgpm.cc:378
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing to completely remove %s"
 -msgstr "Åpner oppsettsfila %s"
 +msgstr "Forbereder å fullstendig slette %s"
  
  #: apt-pkg/deb/dpkgpm.cc:379
 -#, fuzzy, c-format
 +#, c-format
  msgid "Completely removed %s"
 -msgstr "Klarte ikke å fjerne %s"
 +msgstr "Fjernet %s fullstendig"
 +
++#: methods/rred.cc:219
++#, fuzzy
++msgid "Could not patch file"
++msgstr "Kunne ikke åpne fila %s"
+ 
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Forbindelsen ble uventet stengt"
  
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
++#: apt-pkg/acquire-item.cc:1097
++#, fuzzy
++msgid "There is no public key available for the following key IDs:\n"
+ msgstr ""
++"Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n"
+ 
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr "  %s har ingen overstyringsoppføring\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr "  %s har ingen overstyringsoppføring\n"
 -
 -#: methods/rred.cc:219
 -#, fuzzy
 -msgid "Could not patch file"
 -msgstr "Kunne ikke åpne fila %s"
 +#~ msgid "File date has changed %s"
 +#~ msgstr "Fildatoen er endret %s"
  
- #, fuzzy
- #~ msgid "Could not patch file"
- #~ msgstr "Kunne ikke åpne fila %s"
- 
  #~ msgid "Reading file list"
  #~ msgstr "Leser filliste"
  
diff --combined po/nl.po
index 4c0b549a8,671b44a89..6d2528add
--- a/po/nl.po
+++ b/po/nl.po
@@@ -1,159 -1,159 +1,169 @@@
 -# Advanced Package Transfer - APT message translation catalog
 -# Guus Sliepen <guus@sliepen.warande.net>, 2002.
 -# Jochem Berends <j@jochem.net>, 2002.
 -# Wannes Soenen <wannes@wannes.cjb.net>, 2002.
 +# advanced package transfer - apt message translation catalog
 +# guus sliepen <guus@sliepen.warande.net>, 2002.
 +# jochem berends <j@jochem.net>, 2002.
 +# wannes soenen <wannes@wannes.cjb.net>, 2002.
  #
  msgid ""
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-05-27 13:46+0200\n"
 -"PO-Revision-Date: 2005-02-10 17:35+0100\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
 +"PO-Revision-Date: 2006-10-17 22:35+0100\n"
  "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
  "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=iso-8859-15\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Pakket %s versie %s heeft een niet-voldane vereiste:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Kan pakket %s niet vinden"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Totaal aantal pakketnamen: "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Normale pakketten: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
 -msgstr " Puur virtuele pakketten: "
 +msgstr " Zuiver virtuele pakketten: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Losstaande virtuele pakketten: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Gemengde virtuele pakketten: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
 -msgstr "  Missend: "
 +msgstr "  Ontbrekend: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Totaal aantal verschillende versies: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Totaal aantal verschillende versies: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Totaal aantal vereisten: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Totaal aantal versie/bestand-relaties: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Totaal aantal versie/bestand-relaties: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Totaal aantal 'Voorziet'-toewijzingen "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Totaal aantal geglobde strings: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Totale hoeveelheid vereisten-versieruimte: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Totale onbenutte ruimte: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Totale hoeveelheid verantwoorde ruimte: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Pakketbestand %s is niet meer gesynchroniseerd."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "U dient precies één patroon op te geven"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Geen pakketten gevonden"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Pakketbestanden:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "Cache loopt niet synchroon, kan pakketbestand niet 'x-ref'-en"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Vastgepinde pakketten:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(niet gevonden)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Geïnstalleerd: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(geen)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Kandidaat: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Pakketpin: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Versietabel:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s voor %s %s gecompileerd op %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -207,7 -207,7 +217,7 @@@ msgstr "
  "   stats - Toon enkele basisstatistieken\n"
  "   dump - Toon het gehele bestand in een compacte vorm\n"
  "   dumpavail - Print een beschikbaarheidsbestand op stdout\n"
 -"   unmet - Toon vereisten die niet voldaan zijn\n"
 +"   unmet - Toon niet voldane vereisten\n"
  "   search - Toon lijst met pakketten die met regexpatroon overeenkomen\n"
  "   show - Toon een leesbaar dossier voor het pakket\n"
  "   depends - Toon de vereisten voor een pakket\n"
@@@ -218,11 -218,11 +228,11 @@@
  "   policy - Toon beleidsinstellingen\n"
  "\n"
  "Opties:\n"
 -"  -h     Deze hulptekst.\n"
 +"  -h   Deze hulptekst.\n"
  "  -p=? De pakketcache.\n"
  "  -s=? De broncache.\n"
 -"  -q     Voortgangsindicator uitschakelen.\n"
 -"  -i      Toon alleen belangrijke vereisten voor unmet opdracht.\n"
 +"  -q   Voortgangsindicator uitschakelen.\n"
 +"  -i   Toon alleen belangrijke vereisten voor unmet opdracht.\n"
  "  -c=? Lees dit configuratiebestand.\n"
  "  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
  "\n"
@@@ -231,15 -231,18 +241,15 @@@
  #: cmdline/apt-cdrom.cc:78
  msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
  msgstr ""
 +"Gelieve een naam voor deze schijf op te geven, zoals 'Debian 2.1r1 Schijf 1'"
  
  #: cmdline/apt-cdrom.cc:93
 -#, fuzzy
  msgid "Please insert a Disc in the drive and press enter"
 -msgstr ""
 -"Medium wisselen: Gelieve de schijf met label\n"
 -" '%s'\n"
 -"in het station '%s' te plaatsen en op 'enter' te drukken\n"
 +msgstr "Gelieve een schijf in het station te plaatsen en op 'enter' te drukken"
  
  #: cmdline/apt-cdrom.cc:117
  msgid "Repeat this process for the rest of the CDs in your set."
 -msgstr ""
 +msgstr "Dit proces dient herhaald te worden voor alle CD's in uw set."
  
  #: cmdline/apt-config.cc:41
  msgid "Arguments not in pairs"
@@@ -262,15 -265,14 +272,15 @@@ msgid "
  msgstr ""
  "Gebruik: apt-config [opties] opdracht\n"
  "\n"
 -"apt-config is een simpel programma om het APT-configuratiebestand te lezen\n"
 +"apt-config is een eenvoudig programma om het APT-configuratiebestand te "
 +"lezen\n"
  "\n"
  "Opdrachten:\n"
 -"   shell   - Shell modus\n"
 -"   dump - Toon de configuratie\n"
 +"   shell - Shell modus\n"
 +"   dump  - Toon de configuratie\n"
  "\n"
  "Opties:\n"
 -"  -h     Deze hulptekst.\n"
 +"  -h   Deze hulptekst.\n"
  "  -c=? Lees dit configuratiebestand.\n"
  "  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
  
@@@ -304,7 -306,7 +314,7 @@@ msgstr "
  "  -c=? Lees dit configuratiebestand.\n"
  "  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Kan niet naar %s schrijven"
@@@ -338,6 -340,7 +348,6 @@@ msgid "Error processing contents %s
  msgstr "Fout bij het verwerken van de inhoud van %s"
  
  #: ftparchive/apt-ftparchive.cc:556
 -#, fuzzy
  msgid ""
  "Usage: apt-ftparchive [options] command\n"
  "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@@ -378,185 -381,173 +388,185 @@@
  "  -c=?  Read this configuration file\n"
  "  -o=?  Set an arbitrary configuration option"
  msgstr ""
 -"Gebruik: apt-ftparchive [opties] opdracht\n"
 +"Gebruik: apt-ftparchive [opties] commando\n"
  "\n"
 -"Opdrachten: packages binariespad [voorrangsbestand [padprefix]]\n"
 -"            sources bronpad [voorrangsbestand [padprefix]]\n"
 -"            contents pad\n"
 -"            release pad\n"
 +"Commandos': packages <pad naar .deb's> [voorrangsbestand [padprefix]]\n"
 +"            sources <pad naar .dsc's> [voorrangsbestand [padprefix]]\n"
 +"            contents <pad>\n"
 +"            release <pad>\n"
  "            generate config [groepen]\n"
  "            clean config\n"
  "\n"
  "Met apt-ftparchive genereert u index bestanden voor Debian archieven.\n"
 -"Het ondersteunt verschillende aanmaakstijlen gaande van volledig "
 -"automatisch\n"
 -"tot een functionele vervangingen van dpkg-scanpackages en dpkg-scansources\n"
 +"Het ondersteunt verschillende generatiestijlen variërend van volledig \n"
 +"automatisch tot een functionele vervanging van dpkg-scanpackages en \n"
 +"dpkg-scansources\n"
  "\n"
  "apt-ftparchive genereert pakketbestanden van een boom met .debs.\n"
 -"Het pakketbestand bevat de inhoud van alle beheervelden van elk pakket\n"
 -"alsook de MD5 hash en de bestandsgrootte. Via een voorrangsbestand\n"
 +"Het 'Packages'-bestand bevat de inhoud van alle 'control'-velden van elk\n"
 +"pakket alsook de MD5 hash en de bestandsgrootte. Via een voorrangsbestand\n"
  "kunnen de waardes van de 'Priority'- en 'Section'-velden afgedwongen\n"
  "worden.\n"
  "\n"
 -"Op gelijkaardige wijze genereert apt-ftparchive de bronbestanden van\n"
 -"een boom met .dscs. De '--source-override'-optie kan gebruikt worden om\n"
 -"een bronvoorrangsbestand te specificeren.\n"
 +"Op overeenkomstige wijze genereert apt-ftparchive de 'Sources'-bestanden\n"
 +"van een boom met .dscs. De '--source-override'-optie kan gebruikt worden\n"
 +"om een voorrangsbestand voor bronpakketten te specificeren.\n"
  "\n"
  "De 'packages' en 'sources' opdrachten dienen uitgevoerd te worden \n"
 -"in de basismap van de boom. Binariespad dient te verwijzen naar het "
 -"startpunt\n"
 -"van de recursieve zoekopdracht en een voorrangsbestand dient de \n"
 -"voorrangsvlaggen te bevatten. Padprefix wordt toegevoegd aan het "
 -"'filename'-\n"
 -"veld indien dit aanwezig is. Enkele voorbeelden uit het debian archief:\n"
 -"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
 -"               dists/potato/main/binary-i386/Packages\n"
 +"in de basismap van de boom. Het pad naar de .deb's dient te verwijzen naar\n"
 +"het startpunt van de recursieve zoekopdracht en een voorrangsbestand dient\n"
 +"de voorrangsvlaggen te bevatten. Padprefix wordt toegevoegd aan het\n"
 +"'filename'-veld indien dit aanwezig is. Enkele voorbeelden uit het debian\n"
 +"archief:\n"
 +"            apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
 +"            dists/potato/main/binary-i386/Packages\n"
  "\n"
  "Opties:\n"
 -"  -h             Deze hulptekst\n"
 -"  --md5        Beheer de MD5 generatie\n"
 -"  -s=?          Bronvoorrangsbestand\n"
 -"  -q             Stille uitvoer\n"
 -"  -d=?         Selecteerd de optionele caching database\n"
 +"  -h          Deze hulptekst\n"
 +"  --md5       Beheer de MD5 generatie\n"
 +"  -s=?        Bronvoorrangsbestand\n"
 +"  -q          Stille uitvoer\n"
 +"  -d=?        Selecteert de optionele caching database\n"
  "  --no-delink Schakelt de ontlinking debug modus in\n"
  "  --contents  Beheer de generatie van het inhoudsbestand\n"
 -"  -c=?          Lees dit configuratiebestand in\n"
 -"  -o=?          Stel een willekeurige configuratie optie in"
 +"  -c=?        Lees dit configuratiebestand in\n"
 +"  -o=?        Stel een willekeurige configuratie optie in"
  
  #: ftparchive/apt-ftparchive.cc:762
  msgid "No selections matched"
 -msgstr "Er waren geen passende selecties"
 +msgstr "Geen van de selecties kwam overeen"
  
  #: ftparchive/apt-ftparchive.cc:835
  #, c-format
  msgid "Some files are missing in the package file group `%s'"
  msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "DB is beschadigd, bestand hernoemd naar %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
 -msgstr "DB is verouderd, opwaardering %s wordt geprobeerd"
 +msgstr "DB is verouderd, opwaardering van %s wordt geprobeerd"
 +
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +"DB-formaat is ongeldig. Als u opgewaardeerd heeft van een oudere versie, van "
 +"apt, dient u de database te verwijderen en opnieuw aan te maken."
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "Kan het DB-bestand %s niet openen: %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "Bestandsdatum is veranderd %s"
 +msgid "Failed to stat %s"
 +msgstr "Status opvragen van %s is mislukt"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "Archief heeft geen 'control'-record"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "Kan geen cursor verkrijgen"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "W: Kon map %s niet lezen\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "W: Kon de status van %s niet opvragen\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "F: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "W: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "F: Er zijn fouten van toepassing op het bestand "
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "Oplossen van %s is mislukt"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "Doorlopen boomstructuur is mislukt"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "Openen van %s is mislukt"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr " OntlLink %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
 -msgstr "Waarde van link %s weergeven is mislukt"
 +msgstr "Uitvoeren van readlink op %s is mislukt"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "Ontlinken van %s is mislukt"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** Linken van %s aan %s is mislukt"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " Ontlinklimiet van %sB is bereikt.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "Status opvragen van %s is mislukt"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "Archief heeft geen 'package'-veld"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr " %s heeft geen voorrangsingang\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "  %s beheerder is %s, niet %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr " %s heeft geen voorrangsingang voor bronpakketten\n"
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
 -msgstr "Interne fout, kon lokaal onderdeel %s niet vinden"
 +msgstr "Interne fout, kon onderdeel %s niet vinden"
  
  #: ftparchive/contents.cc:353 ftparchive/contents.cc:384
  msgid "realloc - Failed to allocate memory"
@@@ -580,7 -571,7 +590,7 @@@ msgstr "Misvormde voorrangsingang %s o
  #: ftparchive/override.cc:92 ftparchive/override.cc:195
  #, c-format
  msgid "Malformed override %s line %lu #3"
 -msgstr "Misvormde voorrangingang %s op regel %lu #3"
 +msgstr "Misvormde voorrangsingang %s op regel %lu #3"
  
  #: ftparchive/override.cc:131 ftparchive/override.cc:205
  #, c-format
@@@ -632,7 -623,7 +642,7 @@@ msgstr "decompressor
  
  #: ftparchive/multicompress.cc:406
  msgid "IO to subprocess/file failed"
 -msgstr "IO naar subproces is mislukt"
 +msgstr "IO naar subproces/bestand is mislukt"
  
  #: ftparchive/multicompress.cc:458
  msgid "Failed to read while computing MD5"
@@@ -648,258 -639,258 +658,258 @@@ msgstr "Probleem bij het ontlinken van 
  msgid "Failed to rename %s to %s"
  msgstr "Hernoemen van %s naar %s is mislukt"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "J"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Regex-compilatiefout - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "De volgende pakketten hebben niet-voldane vereisten:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "maar %s is geïnstalleerd"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "maar %s zal geïnstalleerd worden"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "maar het is niet installeerbaar"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "maar het is een virtueel pakket"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "maar het is niet geïnstalleerd"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "maar het zal niet geïnstalleerd worden"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " of"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "De volgende pakketten zullen VERWIJDERD worden:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "De volgende pakketten zijn achtergehouden:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "De volgende pakketten zullen opgewaardeerd worden:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
 -msgstr "%s (wegens %s) "
 +msgstr "%s (vanwege %s) "
  
--#: cmdline/apt-get.cc:546
 -#, fuzzy
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
  msgstr ""
 -"WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden\n"
 -"Dit dient NIET gedaan te worden tenzij u echt weet wat u doet!"
 +"WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n"
 +"Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
 -msgstr "%lu pakketten opgewaardeerd, %lu nieuwe pakketten geïnstalleerd, "
 +msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu opnieuw geïnstalleerd, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu gedegradeerd, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
 -msgstr "%lu verwijderen en %lu niet opgewaardeerd.\n"
 +msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
 -msgstr "Vereisten worden verbeterd..."
 +msgstr "Vereisten worden gecorrigeerd..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " mislukt."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
 -msgstr "Kan vereisten niet verbeteren"
 +msgstr "Kan vereisten niet corrigeren"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
 -msgstr "Kon de verzameling van op te waarderen pakketten niet minimaliseren"
 +msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Klaar"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr ""
  "WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden:"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
 -msgstr ""
 +msgstr "Authenticatiewaarschuwing is genegeerd.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Wilt u deze pakketten installeren zonder verificatie [j/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Sommige pakketten konden niet geauthenticeerd worden"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
 -msgstr ""
 +msgstr "Interne fout, InstallPackages is aangeroepen met defecte pakketten!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
  
--#: cmdline/apt-get.cc:775
 -#, fuzzy
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
 -msgstr "Interne fout bij het toevoegen van een omleiding"
 +msgstr "Interne fout, rangschikken is niet voltooid"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Kon de ophaalmap niet vergrendelen"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "De lijst van bronnen kon niet gelezen worden."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
 +"Merkwaardig... De groottes kwamen niet overeen, gelieve apt@packages.debian."
 +"org te mailen"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Er moeten %sB aan archieven opgehaald worden.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "Na het uitpakken zal er %sB extra schijfruimte gebruikt worden.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Na het uitpakken zal er %sB schijfruimte vrijkomen.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 -#, fuzzy, c-format
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
 +#, c-format
  msgid "Couldn't determine free space in %s"
 -msgstr "U heeft niet voldoende vrije schijfruimte op %s"
 +msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
 -msgstr "U heeft niet voldoende vrije schijfruimte op %s."
 +msgstr "U heeft onvoldoende vrije schijfruimte op %s."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Ja, doe wat ik zeg!"
  
--#: cmdline/apt-get.cc:868
 -#, fuzzy, c-format
++#: cmdline/apt-get.cc:883
 +#, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
  "To continue type in the phrase '%s'\n"
  " ?] "
  msgstr ""
  "U staat op het punt om iets te doen wat mogelijk schadelijk is.\n"
 -"Als u wilt doorgaan dient u de zin '%s' in (helemaal) in te tikken.\n"
 +"Als u wilt doorgaan, dient u de zin '%s' in te typen.\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Afbreken."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Wilt u doorgaan [J/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Ophalen van %s %s is mislukt\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Ophalen van sommige bestanden is mislukt"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -907,49 -898,49 +917,49 @@@ msgstr "
  "Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --"
  "fix-missing proberen?"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Geen oplossing voor de missende pakketten gevonden."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Installatie wordt afgebroken."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Let op, %s wordt geselecteerd in plaats van %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  "%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet "
  "gevraagd.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Pakket %s is een virtueel pakket voorzien door:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Geïnstalleerd]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "U dient er één expliciet te selecteren voor installatie."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -960,50 -951,50 +970,50 @@@ msgstr "
  "een ander pakket. Mogelijk betekent dit dat het pakket ontbreekt,\n"
  "verouderd is, of enkel beschikbaar is van een andere bron\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Echter, de volgende pakketten vervangen dit:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Pakket %s heeft geen installeerbare kandidaat"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr ""
  "Herinstallatie van %s is niet mogelijk daar het niet opgehaald kan worden.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s is reeds de nieuwste versie.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Release '%s' voor '%s' is niet gevonden"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Versie '%s' voor '%s' is niet gevonden"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Versie %s (%s) geselecteerd voor %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "De 'update'-opdracht aanvaard geen argumenten"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Kon de lijst-map niet vergrendelen"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1011,27 -1002,27 +1021,46 @@@ msgstr "
  "Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er "
  "zijn oudere versies van gebruikt."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "De volgende informatie helpt u mogelijk verder:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Kon pakket %s niet vinden"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr ""
  "U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te "
  "lossen:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1039,7 -1030,7 +1068,7 @@@ msgstr "
  "Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren "
  "zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1050,7 -1041,7 +1079,7 @@@ msgstr "
  "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n"
  "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1060,123 -1051,124 +1089,119 @@@ msgstr "
  "waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n"
  "best een foutrapport indienen voor dit pakket."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "De volgende informatie helpt u mogelijk verder:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Niet-werkende pakketten:"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "De volgende extra pakketten zullen geïnstalleerd worden:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Voorgestelde pakketten:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Aanbevolen pakketten:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Opwaardering wordt doorgerekend... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Mislukt"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Klaar"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 -#, fuzzy
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
 -msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
 +msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
 -"U dient minstens 1 pakket op te geven waarvan de broncode opgehaald "
 -"moetworden"
 +"U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet "
 +"worden"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Kan geen bronpakket vinden voor %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
 -#, fuzzy, c-format
++#: cmdline/apt-get.cc:2043
 +#, c-format
  msgid "Skipping already downloaded file '%s'\n"
 -msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
 +msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "U heeft niet voldoende vrije schijfruimte op %s"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Moet %sB aan bronarchieven ophalen.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Ophalen bron %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Ophalen van sommige archieven is mislukt."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Uitpakopdracht '%s' is mislukt.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
 -msgstr ""
 +msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Bouwopdracht '%s' is mislukt.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Dochterproces is mislukt"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "U dient tenminste één pakket op te geven om de bouwvereisten van te "
  "controleren"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s heeft geen bouwvereisten.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1185,7 -1177,7 +1210,7 @@@ msgstr "
  "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
  "onvindbaar is"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1194,32 -1186,32 +1219,32 @@@ msgstr "
  "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen "
  "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s "
  "is te nieuw"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Bouwvereisten voor %s konden niet voldaan worden."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Verwerken van de bouwvereisten is mislukt"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Ondersteunde modules:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1410,19 -1402,19 +1435,19 @@@ msgstr "De beschikbare informatie word
  msgid "Failed to create pipes"
  msgstr "Aanmaken pijp is mislukt"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "Uitvoeren van gzip is mislukt "
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Beschadigd archief"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Tar controlesom klopt niet, het pakket is beschadigd"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Onbekende TAR-kopteksttype %u, onderdeel %s"
@@@ -1479,7 -1471,7 +1504,7 @@@ msgid "Duplicate conf file %s/%s
  msgstr "Dubbel configuratiebestand %s/%s"
  
  #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
 -#, fuzzy, c-format
 +#, c-format
  msgid "Failed to write file %s"
  msgstr "Wegschrijven van bestand %s is mislukt"
  
@@@ -1568,9 -1560,9 +1593,9 @@@ msgstr "
  "De 'info'- en de 'temp'-mappen dienen op hetzelfde bestandsysteem te staan"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Pakketlijsten worden ingelezen"
  
@@@ -1699,19 -1691,20 +1724,21 @@@ msgstr "
  "Kan de CD-ROM in %s niet loskoppelen, mogelijk wordt die nog steeds gebruikt."
  
  #: methods/cdrom.cc:169
 -#, fuzzy
  msgid "Disk not found."
 -msgstr "Bestand niet gevonden"
 +msgstr "Schijf niet gevonden"
  
  #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
  msgid "File not found"
  msgstr "Bestand niet gevonden"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Status opvragen is mislukt"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Instellen van de aanpassingstijd is mislukt"
  
@@@ -1839,7 -1832,7 +1866,7 @@@ msgstr "Datasocket verbinding is verlop
  msgid "Unable to accept connection"
  msgstr "Kan de verbinding niet aanvaarden"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Probleem bij het hashen van het bestand"
  
@@@ -1923,134 -1916,127 +1950,134 @@@ msgstr "Er gebeurde iets raars bij het 
  msgid "Unable to connect to %s %s:"
  msgstr "Kan niet verbinden met %s %s:"
  
 -#: methods/gpgv.cc:64
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:65
 +#, c-format
  msgid "Couldn't access keyring: '%s'"
 -msgstr "Kon '%s' niet vinden"
 +msgstr "Kon de sleutelring niet benaderen: '%s'"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr ""
 +"F: argumentenlijst van Acquire::gpv::Options was te lang. Er wordt "
 +"afgesloten."
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
 +"Interne fout: ondertekening is goed maar kon de vingerafdruk van de sleutel\n"
 +"niet bepalen?!"
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
 -msgstr ""
 +msgstr "Er is tenminste één ongeldige ondertekening gevonden."
  
 -#: methods/gpgv.cc:207
 +#: methods/gpgv.cc:213
  #, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
  msgstr ""
 +"Kon '%s' niet uitvoeren om ondertekening te verifiëren (is gnupg "
 +"geïnstalleerd?)"
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
 -msgstr ""
 +msgstr "Onbekende fout bij het uitvoeren van gpgv"
  
 -#: methods/gpgv.cc:243
 -#, fuzzy
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
 -msgstr "De volgende extra pakketten zullen geïnstalleerd worden:"
 +msgstr "De volgende ondertekeningen waren ongeldig:\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
  msgstr ""
 +"De volgende ondertekeningen konden niet geverifiëerd worden omdat de "
 +"publieke sleutel niet beschikbaar is:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Kon geen pijp openen voor %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Leesfout door proces %s"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Wachtend op de kopteksten"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Foute koptekstregel"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr ""
  "Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr ""
  "Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Onbekend datumformaat"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Selectie is mislukt"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Verbinding verliep"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Fout bij het schrijven naar het uitvoerbestand"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Fout bij het schrijven naar bestand"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Fout bij het schrijven naar het bestand"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr ""
  "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Fout bij het lezen van de server"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Foute koptekstdata"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Verbinding mislukt"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Interne fout"
  
@@@ -2063,7 -2049,7 +2090,7 @@@ msgstr "Kan een leeg bestand niet mmapp
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Kon van %lu bytes geen mmap maken"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Selectie %s niet gevonden"
@@@ -2125,12 -2111,12 +2152,12 @@@ msgstr "Syntaxfout %s:%u: Niet-onderste
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Syntaxfout %s:%u: Extra rommel aan het einde van het bestand"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Fout!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Klaar"
@@@ -2267,93 -2253,93 +2294,110 @@@ msgstr "Probleem bij het ontlinken van 
  msgid "Problem syncing the file"
  msgstr "Probleem bij het synchroniseren van het bestand"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Lege pakketcache"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Het pakketcachebestand is beschadigd"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Het pakketcachebestand heeft een niet-compatible versie"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Deze APT ondersteunt het versienummeringssysteem '%s' niet"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "De pakketcache was aangemaakt voor een andere architectuur"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Vereisten"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Voor-Vereisten"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Suggesties"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Aanbevelingen"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Conflicteert met"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Vervangt"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Verouderd"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "belangrijk"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "noodzakelijk"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "standaard"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "optioneel"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Boom van vereisten wordt opgebouwd"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Kandidaat-versies"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Generatie vereisten"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "De beschikbare informatie wordt samengevoegd"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Openen van %s is mislukt"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Wegschrijven van bestand %s is mislukt"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Kon pakketbestand %s niet ontleden (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Kon pakketbestand %s niet ontleden (2)"
@@@ -2388,7 -2374,7 +2432,7 @@@ msgstr "Misvormde regel %lu in bronlijs
  msgid "Opening %s"
  msgstr "%s wordt geopend"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Regel %u van de bronlijst %s is te lang."
@@@ -2399,9 -2385,9 +2443,9 @@@ msgid "Malformed line %u in source lis
  msgstr "Misvormde regel %u in bronlijst %s (type)"
  
  #: apt-pkg/sourcelist.cc:244
 -#, fuzzy, c-format
 +#, c-format
  msgid "Type '%s' is not known on line %u in source list %s"
 -msgstr "Type '%s' is onbekend op regel %u in bronlijst %s"
 +msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
  
  #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
  #, c-format
@@@ -2425,7 -2411,7 +2469,7 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Indexbestandtype '%s' wordt niet ondersteund"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
@@@ -2433,7 -2419,7 +2477,7 @@@ msgstr "
  "Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor "
  "gevonden worden."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2441,9 -2427,9 +2485,9 @@@ msgstr "
  "Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan "
  "veroorzaakt worden door vastgehouden pakketten."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
 -msgstr "Kan problemen niet verhelpen, u houdt niet-werkende pakketten vast."
 +msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast."
  
  #: apt-pkg/acquire.cc:62
  #, c-format
@@@ -2460,12 -2446,12 +2504,12 @@@ msgstr "Archiefmap %spartial is afwezig
  #: apt-pkg/acquire.cc:823
  #, c-format
  msgid "Retrieving file %li of %li (%s remaining)"
 -msgstr ""
 +msgstr "Bestand %li van %li wordt opgehaald (nog %s te gaan)"
  
  #: apt-pkg/acquire.cc:825
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li"
 -msgstr "Bestandslijst worden ingelezen"
 +msgstr "Bestand %li van %li wordt opgehaald"
  
  #: apt-pkg/acquire-worker.cc:113
  #, c-format
@@@ -2478,18 -2464,19 +2522,18 @@@ msgid "Method %s did not start correctl
  msgstr "Methode %s startte niet op de juiste manier"
  
  #: apt-pkg/acquire-worker.cc:377
 -#, fuzzy, c-format
 +#, c-format
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr ""
 -"Medium wisselen: Gelieve de schijf met label\n"
 -" '%s'\n"
 -"in het station '%s' te plaatsen en op 'enter' te drukken\n"
 +"Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op "
 +"'enter' te drukken."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Kan geen geschikt pakketsysteemtype bepalen"
  
@@@ -2527,103 -2514,101 +2571,119 @@@ msgstr "Pintype %s wordt niet begrepen
  msgid "No priority (or zero) specified for pin"
  msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Cache heeft een niet-compatibel versienummeringssysteem"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Fout tijdens verwerken van %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Fout tijdens verwerken van %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Fout tijdens verwerken van %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Fout tijdens verwerken van %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Fout tijdens verwerken van %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Fout tijdens verwerken van %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Fout tijdens verwerken van %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Fout tijdens verwerken van %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Fout tijdens verwerken van %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr "Wauw, u heeft meer pakketten dan deze APT aankan."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "Wauw, u heeft meer versies dan deze APT aankan."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "Wauw, u heeft meer versies dan deze APT aankan."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aankan."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Fout tijdens verwerken van %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Fout tijdens verwerken van %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  "Pakket %s %s werd niet gevonden bij het verwerken van de "
  "bestandsafhankelijkheden"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Kon de status van de bronpakketlijst %s niet opvragen"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Voorziene bestanden worden verzameld"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "hernoeming is mislukt, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "MD5Sum komt niet overeen"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr ""
 +"Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2632,7 -2617,7 +2692,7 @@@ msgstr "
  "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
  "dit pakket handmatig moet repareren (wegens missende architectuur)"
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2641,7 -2626,7 +2701,7 @@@ msgstr "
  "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
  "dit pakket handmatig moet repareren."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
@@@ -2649,7 -2634,7 +2709,7 @@@ msgstr "
  "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
  "pakket %s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Grootte komt niet overeen"
  
@@@ -2658,7 -2643,7 +2718,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Verkopersblok %s bevat geen vingerafdruk"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2667,47 -2652,47 +2727,49 @@@ msgstr "
  "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n"
  "CD wordt aangekoppeld\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Identificatie..."
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Opgeslagen label: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "CD wordt losgekoppeld\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Er wordt gewacht op de schijf...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "CD wordt aangekoppeld...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Er wordt gescant voor indexbestanden...\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "%i pakket-indexen gevonden, %i bron-indexen en %i handtekeningen\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Dat is een ongeldige naam, gelieve opnieuw te proberen.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2716,38 -2701,38 +2778,38 @@@ msgstr "
  "De schijf heet:\n"
  "'%s'\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Pakketlijsten worden gekopieerd..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Nieuwe bronlijst wordt weggeschreven\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Bronlijst-ingangen voor de schijf zijn:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "CD wordt afgekoppeld..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "%i records weggeschreven.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "%i records weggeschreven met %i missende bestanden.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "%i records weggeschreven met %i niet overeenkomende bestanden\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2755,55 -2740,86 +2817,66 @@@
  "bestanden\n"
  
  #: apt-pkg/deb/dpkgpm.cc:358
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing %s"
 -msgstr "%s wordt geopend"
 +msgstr "%s wordt voorbereid"
  
  #: apt-pkg/deb/dpkgpm.cc:359
 -#, fuzzy, c-format
 +#, c-format
  msgid "Unpacking %s"
 -msgstr "%s wordt geopend"
 +msgstr "%s wordt uitgepakt"
  
  #: apt-pkg/deb/dpkgpm.cc:364
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing to configure %s"
 -msgstr "Configuratiebestand %s wordt geopend"
 +msgstr "Configuratie van %s wordt voorbereid"
  
  #: apt-pkg/deb/dpkgpm.cc:365
 -#, fuzzy, c-format
 +#, c-format
  msgid "Configuring %s"
 -msgstr "Er wordt verbinding gemaakt met %s"
 +msgstr "%s wordt geconfigureerd"
  
  #: apt-pkg/deb/dpkgpm.cc:366
 -#, fuzzy, c-format
 +#, c-format
  msgid "Installed %s"
 -msgstr "  Geïnstalleerd: "
 +msgstr "%s is geïnstalleerd"
  
  #: apt-pkg/deb/dpkgpm.cc:371
  #, c-format
  msgid "Preparing for removal of %s"
 -msgstr ""
 +msgstr "Verwijdering van %s wordt voorbereid"
  
  #: apt-pkg/deb/dpkgpm.cc:372
 -#, fuzzy, c-format
 +#, c-format
  msgid "Removing %s"
 -msgstr "%s wordt geopend"
 +msgstr "%s wordt verwijderd"
  
  #: apt-pkg/deb/dpkgpm.cc:373
 -#, fuzzy, c-format
 +#, c-format
  msgid "Removed %s"
 -msgstr "Aanbevelingen"
 +msgstr "%s is verwijderd"
  
  #: apt-pkg/deb/dpkgpm.cc:378
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing to completely remove %s"
 -msgstr "Configuratiebestand %s wordt geopend"
 +msgstr "Volledige verwijdering van %s wordt voorbereid"
  
  #: apt-pkg/deb/dpkgpm.cc:379
 -#, fuzzy, c-format
 +#, c-format
  msgid "Completely removed %s"
 -msgstr "Verwijderen van %s is mislukt"
 -
 -#: methods/rsh.cc:330
 -msgid "Connection closed prematurely"
 -msgstr "Verbinding werd voortijdig afgebroken"
 -
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
 -msgstr ""
 -
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr " %s heeft geen voorrangsingang\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr " %s heeft geen voorrangsingang\n"
 +msgstr "%s is volledig verwijderd"
  
+ #: methods/rred.cc:219
+ #, fuzzy
+ msgid "Could not patch file"
+ msgstr "Kon het bestand %s niet openen"
+ 
 -#~ msgid "Reading file list"
 -#~ msgstr "Bestandslijst wordt ingelezen"
 +#: methods/rsh.cc:330
 +msgid "Connection closed prematurely"
 +msgstr "Verbinding werd voortijdig afgebroken"
+ 
++#: apt-pkg/acquire-item.cc:1097
+ #, fuzzy
 -#~ msgid "Could not execute "
 -#~ msgstr "Kon vergrendeling %s niet verkrijgen"
 -
 -#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 -#~ msgstr "Onbekende verkopers-ID '%s' op regel %u in bronlijst %s"
++msgid "There is no public key available for the following key IDs:\n"
++msgstr ""
++"Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n"
diff --combined po/nn.po
index 21fcba4e4,032267d62..065f5adbd
--- a/po/nn.po
+++ b/po/nn.po
@@@ -3,160 -3,160 +3,170 @@@
  # translation of nn.po to Norwegian Nynorsk
  # translation of apt.po to Norwegian Nynorsk
  # Gaute Hvoslef Kvalnes <gaute@verdsveven.com>, 2003.
 -# Håvard Korsvoll <korsvoll@skulelinux.no>, 2004, 2005.
 +# Havard Korsvoll <korsvoll@skulelinux.no>, 2004, 2005.
  #
  msgid ""
  msgstr ""
  "Project-Id-Version: apt_nn\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-05-27 13:46+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2005-02-14 23:30+0100\n"
 -"Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 +"Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
  "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=ISO-8859-1\n"
  "Content-Transfer-Encoding: 8bit\n"
  "X-Generator: KBabel 1.9.1\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Pakken %s versjon %s har eit krav som ikkje er oppfylt:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Finn ikkje pakken %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Tal på pakkenamn: "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Vanlege pakkar: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Reine virtuelle pakkar: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Enkle virtuelle pakkar: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Samansette virtuelle pakkar: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Manglar: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Tal på einskildversjonar: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Tal på einskildversjonar: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Tal på krav: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Tal på ver./fil-forhold: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Tal på ver./fil-forhold: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Tal på tilbyr-forhold: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Tal på strengar med jokerteikn: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Storleik på kravs- og versjonsrom: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Slingringsmon: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Brukt plass i alt: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Pakkefila %s er ute av takt."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Du må oppgi nøyaktig eitt mnster"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Fann ingen pakkar"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Pakkefiler:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "Mellomlageret er ute av takt, kan ikkje x-referera ei pakkefil"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Spikra pakkar:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(ikkje funne)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Installert: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(ingen)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Kandidat: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Pakke spikra til: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Versjonstabell:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s for %s %s kompilert på %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -307,7 -307,7 +317,7 @@@ msgstr "
  "  -c=? Les denne innstillingsfila.\n"
  "  -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Klarte ikkje skriva til %s"
@@@ -429,126 -429,115 +439,126 @@@ msgstr "Ingen utval passa
  msgid "Some files are missing in the package file group `%s'"
  msgstr "Enkelte filer manglar i pakkefilgruppa %s"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "Databasen er øydelagd. Filnamnet er endra til %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "DB er for gammal, forsøkjer å oppgradere %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "Klarte ikkje opna DB-fila %s: %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "Fildatoen er endra %s"
 +msgid "Failed to stat %s"
 +msgstr "Klarte ikkje få status til %s"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "Arkivet har ingen kontrollpost"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "Klarte ikkje få peikar"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "Å: Klarte ikkje lesa katalogen %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "Å: Klarte ikkje få status til %s\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "F: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "Å: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "F: Det er feil ved fila "
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "Klarte ikkje slå opp %s"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "Treklatring mislukkast"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "Klarte ikkje opna %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr " DeLink %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "Klarte ikkje lesa lenkja %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "Klarte ikkje oppheva lenkja %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** Klarte ikkje lenkja %s til %s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " DeLink-grensa på %sB er nådd.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "Klarte ikkje få status til %s"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "Arkivet har ikkje noko pakkefelt"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr "  %s har inga overstyringsoppføring\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "  %s-vedlikehaldaren er %s, ikkje %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, fuzzy, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr "  %s har inga overstyringsoppføring\n"
 +
 +#: ftparchive/writer.cc:627
 +#, fuzzy, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr "  %s har inga overstyringsoppføring\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -644,79 -633,79 +654,79 @@@ msgstr "Problem ved oppheving av lenkj
  msgid "Failed to rename %s to %s"
  msgstr "Klarte ikkje endra namnet på %s til %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "J"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Regex-kompileringsfeil - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Følgjande pakkar har krav som ikkje er oppfylte:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "men %s er installert"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "men %s skal installerast"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "men lèt seg ikkje installera"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "men er ein virtuell pakke"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "men er ikkje installert"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "men skal ikkje installerast"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " eller"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Dei følgjande NYE pakkane vil verta installerte:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Dei følgjande pakkane vil verta FJERNA:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Dei følgjande pakkane er haldne tilbake:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Dei følgjande pakkane vil verta oppgraderte:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Dei følgjande pakkane vil verta NEDGRADERTE:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Dei følgjande pakkane som er haldne tilbake vil verta endra:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (fordi %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  #, fuzzy
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
@@@ -725,146 -714,146 +735,146 @@@ msgstr "
  "ÅTVARING: Dei følgjande nødvendige pakkane vil verta fjerna.\n"
  "Dette bør IKKJE gjerast utan at du er fullstendig klar over kva du gjer!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu oppgraderte, %lu nyleg installerte, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu installerte på nytt, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu nedgraderte, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Rettar på krav ..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " mislukkast."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Klarte ikkje retta på krav"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Klarte ikkje minimera oppgraderingsmengda"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Ferdig"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr ""
  "Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Nokre krav er ikkje oppfylte. Prøv med «-f»."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "ÅTVARING: Klarer ikkje autentisere desse pakkane."
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Installer desse pakkane utan verifikasjon [j/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Nokre pakkar kunne ikkje bli autentisert"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Det oppstod problem, og «-y» vart brukt utan «--force-yes»"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr ""
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Nokre pakkar må fjernast, men fjerning er slått av."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  #, fuzzy
  msgid "Internal error, Ordering didn't finish"
  msgstr "Intern feil ved tilleggjing av avleiing"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Klarte ikkje låsa nedlastingskatalogen"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Kjeldelista kan ikkje lesast."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Må henta %sB/%sB med arkiv.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Må henta %sB med arkiv.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, fuzzy, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Du har ikkje nok ledig plass i %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Du har ikkje nok ledig plass i %s."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  "«Trivial Only» var spesifisert, men dette er ikkje noka triviell handling."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Ja, gjer som eg seier!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, fuzzy, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -875,28 -864,28 +885,28 @@@ msgstr "
  "For å halda fram, må du skriva nøyaktig «%s».\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Avbryt."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Vil du halda fram [J/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Klarte ikkje henta %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Klarte ikkje henta nokre av filene"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Nedlastinga er ferdig i nedlastingsmodus"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -904,49 -893,49 +914,49 @@@ msgstr "
  "Klarte ikkje henta nokre av arkiva. Du kan prøva med «apt-get update» eller "
  "«--fix-missing»."
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "«--fix-missing» og byte av medium er ikkje støtta for tida"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Klarte ikkje retta opp manglande pakkar."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Avbryt installasjon."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Merk, vel %s i staden for %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  "Hoppar over %s, for den er installert frå før og ikkje sett til "
  "oppgradering.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Pakken %s er ein virtuell pakke, tilbydd av:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Installert]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Du må velja ein som skal installerast."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -957,49 -946,49 +967,49 @@@ msgstr "
  "av ein annan pakke. Dette tyder at pakket manglar, er gjort overflødig\n"
  "eller er berre tilgjengeleg frå ei anna kjelde\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Dei følgjande pakkane kan brukast i staden:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Det finst ingen installasjonskandidat for pakken %s"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "%s kan ikkje installerast på nytt, for pakken kan ikkje lastast ned.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "Den nyaste versjonen av %s er installert frå før.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Fann ikkje utgåva «%s» av «%s»"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Fann ikkje versjonen «%s» av «%s»"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Vald versjon %s (%s) for %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "Oppdateringskommandoen tek ingen argument"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Klarte ikkje låsa listekatalogen"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1007,26 -996,26 +1017,45 @@@ msgstr "
  "Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle "
  "filer er brukte i staden."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "Følgjande informasjon kan hjelpa med å løysa situasjonen:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Intern feil. AllUpgrade øydelagde noko"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Intern feil. AllUpgrade øydelagde noko"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Fann ikkje pakken %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Merk, vel %s i staden for regex «%s»\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr ""
  "Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»."
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1034,7 -1023,7 +1063,7 @@@ msgstr "
  "Nokre krav er ikkje oppfylte. Du kan prøva «apt-get -f install» (eller velja "
  "ei løysing)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1046,7 -1035,7 +1075,7 @@@ msgstr "
  "distribusjonen, kan det òg henda at nokre av pakkane som trengst ikkje\n"
  "er laga enno eller at dei framleis ligg i «Incoming»."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1056,127 -1045,127 +1085,123 @@@ msgstr "
  "pakken rett og slett ikkje lèt seg installera. I såfall bør du senda\n"
  "feilmelding."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "Følgjande informasjon kan hjelpa med å løysa situasjonen:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Øydelagde pakkar"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Dei følgjande tilleggspakkane vil verta installerte:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Føreslåtte pakkar:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Tilrådde pakkar"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Reknar ut oppgradering ... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Mislukkast"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Ferdig"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  #, fuzzy
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Intern feil. AllUpgrade øydelagde noko"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "Du må velja minst éin pakke som kjeldekoden skal hentast for"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Finn ingen kjeldepakke for %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:2043
  #, fuzzy, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Du har ikkje nok ledig plass i %s"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Må henta %sB/%sB med kjeldekodearkiv.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Må henta %sB med kjeldekodearkiv.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Hent kjeldekode %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Klarte ikkje henta nokre av arkiva."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Utpakkingskommandoen «%s» mislukkast.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Byggjekommandoen «%s» mislukkast.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Barneprosessen mislukkast"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr "Du må velja minst ein pakke som byggjekrava skal sjekkast for"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Klarte ikkje henta byggjekrav for %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s har ingen byggjekrav.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1185,31 -1174,31 +1210,31 @@@ msgstr "
  "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon "
  "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Klarte ikkje behandla byggjekrava"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Støtta modular:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1389,19 -1378,19 +1414,19 @@@ msgstr "Flettar informasjon om tilgjeng
  msgid "Failed to create pipes"
  msgstr "Klarte ikkje oppretta røyr"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "Klarte ikkje køyra gzip "
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Øydelagt arkiv"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Tar-sjekksummen mislukkast, arkivet er øydelagt"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Ukjend TAR-hovud type %u, medlem %s"
@@@ -1547,9 -1536,9 +1572,9 @@@ msgstr "
  "Infokatalogen og den mellombelse katalogen må vera på det same filsystemet"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Les pakkelister"
  
@@@ -1685,12 -1674,12 +1710,14 @@@ msgstr "Fann ikkje fila
  msgid "File not found"
  msgstr "Fann ikkje fila"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Klarte ikkje få status"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Klarte ikkje setja endringstidspunkt"
  
@@@ -1818,7 -1807,7 +1845,7 @@@ msgstr "Tidsavbrot på tilkopling til da
  msgid "Unable to accept connection"
  msgstr "Klarte ikkje godta tilkoplinga"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Problem ved oppretting av nøkkel for fil"
  
@@@ -1902,124 -1891,124 +1929,124 @@@ msgstr "Det hende noko dumt ved oppsla
  msgid "Unable to connect to %s %s:"
  msgstr "Klarte ikkje kopla til %s %s:"
  
 -#: methods/gpgv.cc:64
 +#: methods/gpgv.cc:65
  #, fuzzy, c-format
  msgid "Couldn't access keyring: '%s'"
  msgstr "Klarte ikkje slå opp «%s»"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr ""
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr ""
  
 -#: methods/gpgv.cc:207
 +#: methods/gpgv.cc:213
  #, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
  msgstr ""
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr ""
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  #, fuzzy
  msgid "The following signatures were invalid:\n"
  msgstr "Dei følgjande tilleggspakkane vil verta installerte:"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
  msgstr ""
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Klarte ikkje opna røyr for %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Lesefeil frå %s-prosessen"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Ventar på hovud"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Fekk ei enkel hovudlinje over %u teikn"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Øydelagd hovudlinje"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "HTTP-tenaren sende eit ugyldig svarhovud"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "HTTP-tenaren sende eit ugyldig «Content-Length»-hovud"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "HTTP-tenaren sende eit ugyldig «Content-Range»-hovud"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "Denne HTTP-tenaren har øydelagd støtte for område"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Ukjend datoformat"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Utvalet mislukkast"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Tidsavbrot på sambandet"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Feil ved skriving til utfil"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Feil ved skriving til fil"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Feil ved skriving til fila"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Feil ved lesing frå tenaren. Sambandet vart lukka i andre enden"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Feil ved lesing frå tenaren"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Øydelagde hovuddata"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Sambandet mislukkast"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Intern feil"
  
@@@ -2032,7 -2021,7 +2059,7 @@@ msgstr "Kan ikkje utføra mmap på ei to
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Klarte ikkje laga mmap av %lu byte"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Fann ikkje utvalet %s"
@@@ -2092,12 -2081,12 +2119,12 @@@ msgstr "Syntaksfeil %s:%u: Direktivet «
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s ... Feil"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s ... Ferdig"
@@@ -2229,93 -2218,93 +2256,110 @@@ msgstr "Problem ved oppheving av lenkj
  msgid "Problem syncing the file"
  msgstr "Problem ved synkronisering av fila"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Tomt pakkelager"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Pakkelagerfila er øydelagd"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Versjonen til pakkelagerfila er ikkje kompatibel"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "APT støttar ikkje versjonssystemet «%s»"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "Pakkelageret er bygd for ein annan arkitektur"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Krav"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Forkrav"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Forslag"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Tilrådingar"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Konflikt"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Byter ut"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Foreldar"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "viktig"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "påkravd"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "vanleg"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "valfri"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "tillegg"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Byggjer kravtre"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Kandidatversjonar"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Genererer kravforhold"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Flettar informasjon om tilgjengelege pakkar"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Klarte ikkje opna %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Klarte ikkje skriva fila %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Klarte ikkje tolka pakkefila %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Klarte ikkje tolka pakkefila %s (2)"
@@@ -2350,7 -2339,7 +2394,7 @@@ msgstr "Misforma linje %lu i kjeldelist
  msgid "Opening %s"
  msgstr "Opnar %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Linja %u i kjeldelista %s er for lang."
@@@ -2387,13 -2376,13 +2431,13 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Indeksfiltypen «%s» er ikkje støtta"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr "Pakken %s må installerast på nytt, men arkivet finst ikkje."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2401,7 -2390,7 +2445,7 @@@ msgstr "
  "Feil, «pkgProblemResolver::Resolve» har laga brot. Dette kan skuldast pakkar "
  "som er haldne tilbake."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  "Klarte ikkje retta opp problema. Nokre øydelagde pakkar er haldne tilbake."
@@@ -2446,12 -2435,12 +2490,12 @@@ msgstr "
  " «%s»\n"
  "i stasjonen «%s» og trykk Enter.\n"
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Pakkesystemet «%s» er ikkje støtta"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
  
@@@ -2486,99 -2475,99 +2530,115 @@@ msgstr "Skjønar ikkje spikringstypen %s
  msgid "No priority (or zero) specified for pin"
  msgstr "Ingen prioritet (eller null) oppgitt for spiker"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Feil ved behandling av %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Feil ved behandling av %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Feil ved behandling av %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Feil ved behandling av %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Feil ved behandling av %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Feil ved behandling av %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Feil ved behandling av %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Feil ved behandling av %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Feil ved behandling av %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr "Jøss, du har overgått talet på pakkenamn som APT kan handtera."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "Jøss, du har overgått talet på versjonar som APT kan handtera."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "Jøss, du har overgått talet på versjonar som APT kan handtera."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr "Jøss, du har overgått talet på krav som APT kan handtera."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Feil ved behandling av %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Feil ved behandling av %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "Fann ikkje pakken %s %s ved behandling av filkrav"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Klarte ikkje få status på kjeldepakkelista %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Samlar inn filtilbod"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "IU-feil ved lagring av kjeldelager"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "endring av namn mislukkast, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "Feil MD5-sum"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
  msgid "There are no public key available for the following key IDs:\n"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2587,7 -2576,7 +2647,7 @@@ msgstr "
  "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:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2595,14 -2584,14 +2655,14 @@@
  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:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  "Pakkeindeksfilene er øydelagde. Feltet «Filename:» manglar for pakken %s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Feil storleik"
  
@@@ -2611,7 -2600,7 +2671,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2620,47 -2609,47 +2680,49 @@@ msgstr "
  "Brukar monteringspunktet %s for CD-ROM\n"
  "Monterer CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Identifiserer ... "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Lagra etikett: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Brukar monteringspunktet %s for CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Avmonterer CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Ventar på disk ...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Monterer CD-ROM ...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Leitar etter indeksfiler på disken ...\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Det er ikkje eit gyldig namn, prøv igjen.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2669,38 -2658,38 +2731,38 @@@ msgstr "
  "Disken vert kalla: \n"
  "«%s»\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Kopierer pakkelister ..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Skriv ny kjeldeliste\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Kjeldelisteoppføringar for denne disken er:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Avmonterer CD-ROM ..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Skreiv %i postar.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Skreiv %i postar med %i manglande filer.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Skreiv %i postar med %i filer som ikkje passa\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n"
@@@ -2755,17 -2744,31 +2817,22 @@@ msgstr "Opnar oppsettsfila %s
  msgid "Completely removed %s"
  msgstr "Klarte ikkje fjerna %s"
  
++#: methods/rred.cc:219
++#, fuzzy
++msgid "Could not patch file"
++msgstr "Klarte ikkje opna fila %s"
++
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Sambandet vart uventa stengd"
  
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
++#: apt-pkg/acquire-item.cc:1097
++msgid "There is no public key available for the following key IDs:\n"
+ msgstr ""
+ 
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr "  %s har inga overstyringsoppføring\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr "  %s har inga overstyringsoppføring\n"
 -
 -#: methods/rred.cc:219
 -#, fuzzy
 -msgid "Could not patch file"
 -msgstr "Klarte ikkje opna fila %s"
 +#~ msgid "File date has changed %s"
 +#~ msgstr "Fildatoen er endra %s"
  
- #, fuzzy
- #~ msgid "Could not patch file"
- #~ msgstr "Klarte ikkje opna fila %s"
- 
  #~ msgid "Reading file list"
  #~ msgstr "Les filliste"
  
diff --combined po/pl.po
index 675c9b4b0,8be562ac6..1c7e34c64
--- a/po/pl.po
+++ b/po/pl.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
  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: 2006-05-27 13:46+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2006-01-23 15:32+0100\n"
  "Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
  "Language-Team: Polish <pddp@debian.linux.org.pl>\n"
@@@ -14,147 -14,147 +14,155 @@@
  "Content-Type: text/plain; charset=ISO-8859-2\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Pakiet %s w wersji %s ma niespe³nione zale¿no¶ci:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Nie uda³o siê odnale¼æ pakietu %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Liczba nazw pakietów : "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Zwyk³ych pakietów: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Czysto wirtualnych pakietów: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Pojedynczych pakietów wirtualnych: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Mieszanych pakietów wirtualnych: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Brakuj±cych: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "W sumie ró¿nych wersji: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++msgid "Total Distinct Descriptions: "
++msgstr "W sumie ró¿nych opisów: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "W sumie zale¿no¶ci: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "W sumie zale¿no¶ci wersja/plik: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++msgid "Total Desc/File relations: "
++msgstr "W sumie zale¿no¶ci opis/plik: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "W sumie mapowañ zapewnieñ: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "W sumie dopasowanych napisów: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Sumaryczny rozmiar obszaru zale¿no¶ci od wersji: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Sumaryczny rozmiar niewykorzystanego miejsca: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Ca³kowity rozmiar: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Plik pakietu %s jest przestarza³y."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Nale¿y podaæ dok³adnie jeden wzór"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Nie znaleziono ¿adnych pakietów"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Plików pakietów:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  "Magazyn podrêczny jest przestarza³y, nie mo¿na odwo³aæ siê (x-ref) do pliku "
  "pakietu."
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Przypiête pakiety:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(nieznaleziony)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Zainstalowana: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(brak)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Kandyduj±ca: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Sposób przypiêcia: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Tabela wersji:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s dla %s %s skompilowany %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -303,7 -303,7 +311,7 @@@ msgstr "
  "  -c=? Czytaj ten plik konfiguracyjny.\n"
  "  -o=? Ustaw dowoln± opcjê konfiguracji, np. -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Nie uda³o siê pisaæ do %s"
@@@ -427,126 -427,115 +435,126 @@@ msgstr "Nie dopasowano ¿adnej nazwy
  msgid "Some files are missing in the package file group `%s'"
  msgstr "Brakuje pewnych plików w grupie plików pakietów `%s'"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "Baza by³a uszkodzona, plik zosta³ przeniesiony do %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "Baza jest przestarza³a, próbujê zaktualizowaæ %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "Nie uda³o siê otworzyæ pliku DB %s: %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "Data pliku uleg³a zmianie %s"
 +msgid "Failed to stat %s"
 +msgstr "Nie uda³o siê wykonaæ operacji stat na %s"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "Archiwum nie posiada rekordu control"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "Nie uda³o siê pobraæ kursora"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "W: Nie uda³o siê odczytaæ katalogu %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "W: Nie mo¿na wykonaæ operacji stat na %s\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "E: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "W: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "E: B³êdy odnosz± siê do pliku "
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "Nie uda³o siê przet³umaczyæ nazwy %s"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "Przej¶cie po drzewie nie powiod³o siê"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "Nie uda³o siê otworzyæ %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr " Od³±czenie %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "Nie uda³o siê odczytaæ dowi±zania %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "Nie uda³o siê usun±æ %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** Nie uda³o siê dowi±zaæ %s do %s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " Osi±gniêto ograniczenie od³±czania %sB.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "Nie uda³o siê wykonaæ operacji stat na %s"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "Archiwum nie posiada³o pola pakietu"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr "  %s nie posiada wpisu w pliku override\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "  opiekunem %s jest %s, a nie %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, fuzzy, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr "  %s nie posiada wpisu w pliku override\n"
 +
 +#: ftparchive/writer.cc:627
 +#, fuzzy, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr "  %s nie posiada wpisu w pliku override\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -642,79 -631,79 +650,79 @@@ msgstr "Problem przy usuwaniu %s
  msgid "Failed to rename %s to %s"
  msgstr "Nie uda³o siê zmieniæ nazwy %s na %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "T"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "B³±d kompilacji wyra¿enia regularnego - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Nastêpuj±ce pakiety maj± niespe³nione zale¿no¶ci:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "ale %s jest zainstalowany"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "ale %s ma zostaæ zainstalowany"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "ale nie da siê go zainstalowaæ"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "ale jest pakietem wirtualnym"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "ale nie jest zainstalowany"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "ale nie zostanie zainstalowany"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " lub"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Zostan± zainstalowane nastêpuj±ce NOWE pakiety:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Nastêpuj±ce pakiety zostan± USUNIÊTE:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Nastêpuj±ce pakiety zosta³y zatrzymane:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Nastêpuj±ce pakiety zostan± zaktualizowane:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Zostan± zainstalowane STARE wersje nastêpuj±cych pakietów:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Zostan± zmienione nastêpuj±ce zatrzymane pakiety:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (z powodu %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -722,143 -711,143 +730,143 @@@ msgstr "
  "UWAGA: Zostan± usuniête nastêpuj±ce istotne pakiety.\n"
  "Nie powinno siê tego robiæ, chyba ¿e dok³adnie wiesz, co robisz!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu przeinstalowywanych, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu cofniêtych wersji, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu usuwanych i %lu nieaktualizowanych.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu nie w pe³ni zainstalowanych lub usuniêtych.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Naprawianie zale¿no¶ci..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " nie uda³o siê."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Nie uda³o siê naprawiæ zale¿no¶ci"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Nie uda³o siê zminimalizowaæ zbioru aktualizacji"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Gotowe"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "Nale¿y uruchomiæ `apt-get -f install', aby je naprawiæ."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Niespe³nione zale¿no¶ci. Spróbuj u¿yæ -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "UWAGA: Nastêpuj±ce pakiety nie mog± zostaæ zweryfikowane!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "Ostrze¿enie uwierzytelniania zignorowano.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Zainstalowaæ te pakiety bez weryfikacji [t/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Niektóre pakiety nie mog³y zostaæ zweryfikowane"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "By³y problemy, a u¿yto -y bez --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "B³±d wewnêtrzny, InstallPackages u¿yto z zepsutymi pakietami!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Pakiety powinny zostaæ usuniête, ale Remove jest wy³±czone."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "B³±d wewnêtrzny, sortowanie niezakoñczone"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Nie uda³o siê zablokowaæ katalogu pobierania"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Nie uda³o siê odczytaæ list ¼róde³."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr "Dziwne.. rozmiary siê nie zgadzaj±, zg³o¶ pod apt@packages.debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Konieczne pobranie %sB/%sB archiwów.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Konieczne pobranie %sB archiwów.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "Po rozpakowaniu zostanie dodatkowo u¿yte %sB miejsca na dysku.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Po rozpakowaniu zostanie zwolnione %sB miejsca na dysku.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Nie uda³o siê ustaliæ ilo¶ci wolnego miejsca w %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Niestety w %s nie ma wystarczaj±cej ilo¶ci wolnego miejsca."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "Nakazano wykonywaæ tylko trywialne operacje, a to nie jest trywialne."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Tak, rób jak mówiê!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -869,28 -858,28 +877,28 @@@ msgstr "
  "Aby kontynuowaæ wpisz zdanie '%s'\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Przerwane."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Czy chcesz kontynuowaæ [T/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Nie uda³o siê pobraæ %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Nie uda³o siê pobraæ niektórych plików"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Ukoñczono pobieranie w trybie samego pobierania"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -898,48 -887,48 +906,48 @@@ msgstr "
  "Nie uda³o siê pobraæ niektórych archiwów, spróbuj uruchomiæ apt-get update "
  "lub u¿yæ opcji --fix-missing"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing i zamienianie no¶ników nie jest obecnie obs³ugiwane"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Nie uda³o siê poprawiæ brakuj±cych pakietów."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Przerywanie instalacji"
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Uwaga, wybieranie %s zamiast %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  "Pomijanie %s, jest ju¿ zainstalowane, a nie zosta³o wybrana aktualizacja.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Pakiet %s nie jest zainstalowany, wiêc nie zostanie usuniêty.\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Pakiet %s jest pakietem wirtualnym zapewnianym przez:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Zainstalowany]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Nale¿y jednoznacznie wybraæ jeden z nich do instalacji."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -950,50 -939,50 +958,50 @@@ msgstr "
  "Zazwyczaj oznacza to, ¿e pakietu brakuje, zosta³ zast±piony przez inny\n"
  "pakiet lub nie jest dostêpny przy pomocy obecnie ustawionych ¼róde³.\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Jednak nastêpuj±ce pakiety go zastêpuj±:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Pakiet %s nie ma kandydata do instalacji"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr ""
  "Przeinstalowanie pakietu %s nie jest mo¿liwe, nie mo¿e on zostaæ pobrany.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s jest ju¿ w najnowszej wersji.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Wydanie '%s' dla '%s' nie zosta³o znalezione"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Wersja '%s' dla '%s' nie zosta³a znaleziona"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Wybrano wersjê %s (%s) dla %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "Polecenie update nie wymaga ¿adnych argumentów"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Nie uda³o siê zablokowaæ katalogu list"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1001,25 -990,25 +1009,44 @@@ msgstr "
  "Nie uda³o siê pobraæ niektórych plików indeksu, zosta³y one zignorowane lub "
  "zosta³a u¿yta ich starsza wersja."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "Nastêpuj±ce informacje mog± pomóc rozpoznaæ sytuacjê:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "B³±d wewnêtrzny, rozwi±zywanie problemów wszystko popsu³o"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "B³±d wewnêtrzny, AllUpgrade wszystko popsu³o"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Nie uda³o siê odnale¼æ pakietu %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Uwaga, wybieranie %s za wyra¿enie '%s'\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "Nale¿y uruchomiæ `apt-get -f install', aby je naprawiæ:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1027,7 -1016,7 +1054,7 @@@ msgstr "
  "Niespe³nione zale¿no¶ci. Spróbuj 'apt-get -f install' bez pakietów (lub "
  "podaj rozwi±zanie)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1039,7 -1028,7 +1066,7 @@@ msgstr "
  "w której niektóre pakiety nie zosta³y jeszcze utworzone lub przeniesione\n"
  "z katalogu Incoming (\"Przychodz±ce\")."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1049,124 -1038,124 +1076,120 @@@ msgstr "
  "danego pakietu po prostu nie da siê zainstalowaæ i nale¿y zg³osiæ w nim\n"
  "b³±d."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "Nastêpuj±ce informacje mog± pomóc rozpoznaæ sytuacjê:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Pakiety s± b³êdne"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Zostan± zainstalowane nastêpuj±ce dodatkowe pakiety:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Sugerowane pakiety:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Polecane pakiety:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Obliczanie aktualizacji..."
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Nie uda³o siê"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Gotowe"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "B³±d wewnêtrzny, rozwi±zywanie problemów wszystko popsu³o"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  "Nale¿y podaæ przynajmniej jeden pakiet, dla którego maj± zostaæ pobrane "
  "¼ród³a"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Nie uda³o siê odnale¼æ ¼ród³a dla pakietu %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Pomijanie ju¿ pobranego pliku '%s'\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "W %s nie ma wystarczaj±cej ilo¶ci wolnego miejsca"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Konieczne pobranie %sB/%sB archiwów ¼róde³.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Konieczne pobranie %sB archiwów ¼róde³.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Pobierz ¼ród³o %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Nie uda³o siê pobraæ niektórych archiwów."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Pomijanie rozpakowania ju¿ rozpakowanego ¼ród³a w %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Polecenie rozpakowania '%s' zawiod³o.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Sprawd¼ czy pakiet 'dpkg-dev' jest zainstalowany.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Polecenie budowania '%s' zawiod³o.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Proces potomny zawiód³"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "Nale¿y podaæ przynajmniej jeden pakiet, dla którego maj± zostaæ pakiety "
  "wymagane do budowania"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr ""
  "Nie uda³o siê pobraæ informacji o zale¿no¶ciach na czas budowania dla %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s nie ma zale¿no¶ci czasu budowania.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1175,7 -1164,7 +1198,7 @@@ msgstr "
  "Zale¿no¶æ %s od %s nie mo¿e zostaæ spe³niona, poniewa¿ nie znaleziono "
  "pakietu %s"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1184,32 -1173,32 +1207,32 @@@ msgstr "
  "Zale¿no¶æ %s od %s nie mo¿e zostaæ spe³niona, poniewa¿ ¿adna z dostêpnych "
  "wersji pakietu %s nie ma odpowiedniej wersji"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Nie uda³o siê spe³niæ zale¿no¶ci %s od %s: Zainstalowany pakiet %s jest zbyt "
  "nowy"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Nie uda³o siê spe³niæ zale¿no¶ci %s od %s: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Nie uda³o siê spe³niæ zale¿no¶ci na czas budowania od %s."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Nie uda³o siê przetworzyæ zale¿no¶ci na czas budowania"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Obs³ugiwane modu³y:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1393,19 -1382,19 +1416,19 @@@ msgstr "£±czenie informacji o dostêpnyc
  msgid "Failed to create pipes"
  msgstr "Nie uda³o siê utworzyæ potoków"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "Nie uda³o uruchomiæ programu gzip "
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Uszkodzone archiwum"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Nieznany typ nag³ówka TAR %u, sk³adnik %s"
@@@ -1550,9 -1539,9 +1573,9 @@@ msgid "The info and temp directories ne
  msgstr "Pliki info i temp musz± byæ na tym samym systemie plików"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Czytanie list pakietów"
  
@@@ -1685,12 -1674,12 +1708,14 @@@ msgstr "Nie odnaleziono dysku.
  msgid "File not found"
  msgstr "Nie odnaleziono pliku"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Nie uda³o siê wykonaæ operacji stat"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Nie uda³o siê ustawiæ czasu modyfikacji"
  
@@@ -1819,7 -1808,7 +1844,7 @@@ msgstr "Przekroczony czas po³±czenia gn
  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:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Nie uda³o siê obliczyæ skrótu pliku"
  
@@@ -1903,40 -1892,40 +1928,40 @@@ msgstr "Co¶ niegodziwego sta³o siê prz
  msgid "Unable to connect to %s %s:"
  msgstr "Nie uda³o siê po³±czyæ z %s %s:"
  
 -#: methods/gpgv.cc:64
 +#: methods/gpgv.cc:65
  #, fuzzy, c-format
  msgid "Couldn't access keyring: '%s'"
  msgstr "Nie uda³o siê przet³umaczyæ nazwy '%s'"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr "E: Lista argumentów Acquire::gpgv::Options zbyt d³uga. Wychodzimy."
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
  "B³±d wewnêtrzny: Prawid³owa sygnatura, ale nie nie uda³o siê ustaliæ "
  "jejodcisku?!"
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr "Napotkano przynajmniej jedn± nieprawid³ow± sygnaturê."
  
 -#: methods/gpgv.cc:207
 +#: methods/gpgv.cc:213
  #, fuzzy, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
  msgstr " by zweryfikowaæ sygnaturê (czy gnupg jest zainstalowane?)"
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr "Nieznany b³±d podczas uruchamiania gpgv"
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
  msgstr "Nastêpuj±ce sygnatury by³y b³êdne:\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
@@@ -1944,86 -1933,86 +1969,86 @@@ msgstr "
  "Nastêpuj±ce sygnatury nie mog³y zostaæ zweryfikowane z powodu braku klucza "
  "publicznego:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Nie uda³o siê otworzyæ potoku dla %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "B³±d odczytu z procesu %s"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Oczekiwanie na nag³ówki"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, 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:529
  msgid "Bad header line"
  msgstr "Nieprawid³owa linia nag³ówka"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "Serwer HTTP przys³a³ nieprawid³owy nag³ówek odpowiedzi"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  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:599
  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:601
  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:625
  msgid "Unknown date format"
  msgstr "Nieznany format daty"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Operacja select nie powiod³a siê"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Przekroczenie czasu po³±czenia"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "B³±d przy pisaniu do pliku wyj¶ciowego"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "B³±d przy pisaniu do pliku"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "B³±d przy pisaniu do pliku"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  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:875
  msgid "Error reading from server"
  msgstr "B³±d czytania z serwera"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "B³êdne dane nag³ówka"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Po³±czenie nie uda³o siê"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "B³±d wewnêtrzny"
  
@@@ -2036,7 -2025,7 +2061,7 @@@ msgstr "Nie mo¿na wykonaæ mmap na pusty
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Nie uda³o siê wykonaæ mmap %lu bajtów"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Nie odnaleziono wyboru %s"
@@@ -2097,12 -2086,12 +2122,12 @@@ msgstr "B³±d sk³adniowy %s:%u: Nieobs³u
  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: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:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Gotowe"
@@@ -2234,93 -2223,93 +2259,110 @@@ msgstr "Problem przy usuwaniu pliku
  msgid "Problem syncing the file"
  msgstr "Problem przy zapisywaniu pliku na dysk"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Pusty magazyn podrêczny pakietów"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Magazyn podrêczny pakietów jest uszkodzony"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Magazyn podrêczny pakietów jest w niezgodnej wersji"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Ta wersja APT nie obs³uguje systemu wersji '%s'"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "Ten magazyn podrêczny pakietów zosta³ zbudowany dla innej architektury"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Wymaga"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "PreWymaga"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Sugeruje"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Poleca"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Jest w konflikcie z"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Zastêpuje"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Czyni zbêdnym"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "wa¿ny"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "wymagany"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "standardowy"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "opcjonalny"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "dodatkowy"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Budowanie drzewa zale¿no¶ci"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Kandyduj±ce wersje"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Generowanie zale¿no¶ci"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "£±czenie informacji o dostêpnych pakietach"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Nie uda³o siê otworzyæ %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Nie uda³o siê zapisaæ pliku %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Nie uda³o siê zanalizowaæ pliku pakietu %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Nie uda³o siê zanalizowaæ pliku pakietu %s (2)"
@@@ -2355,7 -2344,7 +2397,7 @@@ msgstr "Nieprawid³owa linia %lu w li¶ci
  msgid "Opening %s"
  msgstr "Otwieranie %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Linia %u w li¶cie ¼róde³ %s jest zbyt d³uga."
@@@ -2392,14 -2381,14 +2434,14 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Plik indeksu typu '%s' nie jest obs³ugiwany"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  "Pakiet %s ma zostaæ przeinstalowany, ale nie mo¿na znale¼æ jego archiwum."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2407,7 -2396,7 +2449,7 @@@ msgstr "
  "B³±d, pkgProblemResolver::Resolve zwróci³ b³±d, mo¿e to byæ spowodowane "
  "\"zatrzymanymi\" pakietami."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr "Nie uda³o siê naprawiæ problemów, zatrzymano uszkodzone pakiety."
  
@@@ -2448,12 -2437,12 +2490,12 @@@ msgstr "Metoda %s nie uruchomi³a siê po
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr "W³ó¿ do napêdu '%s' dysk o nazwie: '%s' i naci¶nij enter."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "System pakietów '%s' nie jest obs³ugiwany"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Nie uda³o siê okre¶liæ odpowiedniego typu systemu pakietów"
  
@@@ -2487,103 -2476,102 +2529,118 @@@ msgstr "Nierozpoznany typ przypinania %
  msgid "No priority (or zero) specified for pin"
  msgstr "Brak (lub zerowy) priorytet przypiêcia"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Magazyn podrêczny ma niezgodny system wersji"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewFileDesc1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewFileDesc2)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  "Och, przekroczono liczbê pakietów, któr± ten APT jest w stanie obs³u¿yæ."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "Och, przekroczono liczbê wersji, któr± ten APT jest w stanie obs³u¿yæ."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "Och, przekroczono liczbê opisów, któr± ten APT jest w stanie obs³u¿yæ."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  "Och, przekroczono liczbê zale¿no¶ci, któr± ten APT jest w stanie obs³u¿yæ."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  "Pakiet %s %s nie zosta³ odnaleziony podczas przetwarzania zale¿no¶ci plików"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Nie uda³o siê wykonaæ operacji stat na li¶cie pakietów ¼ród³owych %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Zbieranie zapewnieñ plików"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "B³±d wej¶cia/wyj¶cia przy zapisywaniu podrêcznego magazynu ¼róde³"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  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:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "B³êdna suma MD5"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are 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:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2592,7 -2580,7 +2649,7 @@@ msgstr "
  "Nie uda³o siê odnale¼æ pliku dla pakietu %s. Mo¿e to oznaczaæ, ¿e trzeba "
  "bêdzie rêcznie naprawiæ ten pakiet (z powodu brakuj±cej architektury)."
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2601,14 -2589,14 +2658,14 @@@ msgstr "
  "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:1305
  #, 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:1392
  msgid "Size mismatch"
  msgstr "B³êdny rozmiar"
  
@@@ -2617,7 -2605,7 +2674,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Blok producenta %s nie zawiera odcisku"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2626,49 -2614,49 +2683,51 @@@ msgstr "
  "Wykorzystuê %s jako punkt montowania CD-ROMu\n"
  "Montowanie CD-ROMu\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Identyfikacja.. "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Etykieta: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Wykorzystujê %s jako punkt montowania CD-ROMu\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Odmontowanie CD-ROMu\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Oczekiwanie na p³ytê...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Montowanie CD-ROMu...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Skawnowanie p³yty w poszukiwaniu plików indeksu..\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr ""
  "Znaleziono %i 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:737
  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:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2677,38 -2665,38 +2736,38 @@@ msgstr "
  "P³yta nosi nazwê: \n"
  "'%s'\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Kopiowanie list pakietów..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Zapisywanie nowej listy ¼róde³\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "¬ród³a dla tej p³yty to:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Odmontowanie CD-ROMu..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Zapisano %i rekordów.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Zapisano %i rekordów z %i brakuj±cymi plikami.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Zapisano %i rekordów z %i niepasuj±cymi plikami\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr "Zapisano %i rekordów z %i brakuj±cymi plikami i %i niepasuj±cymi\n"
@@@ -2763,13 -2751,10 +2822,22 @@@ msgstr "Przygotowanie do konfiguracji %
  msgid "Completely removed %s"
  msgstr "Nie uda³o siê usun±æ %s"
  
++#: methods/rred.cc:219
++msgid "Could not patch file"
++msgstr "Nie uda³o siê na³o¿yæ ³atki na plik"
++
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Po³±czenie zosta³o zamkniête przedwcze¶nie"
  
++#: apt-pkg/acquire-item.cc:1097
++#, 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"
++
 +#~ msgid "File date has changed %s"
 +#~ msgstr "Data pliku uleg³a zmianie %s"
 +
  #~ msgid "Reading file list"
  #~ msgstr "Czytanie listy plików"
  
@@@ -2781,22 -2766,22 +2849,3 @@@
  
  #~ msgid "Removed with config %s"
  #~ msgstr "Usuniêto %s wraz z konfiguracj±"
--
--#~ msgid "Total Distinct Descriptions: "
--#~ msgstr "W sumie ró¿nych opisów: "
--
--#~ msgid "Total Desc/File relations: "
--#~ msgstr "W sumie zale¿no¶ci opis/plik: "
--
--#~ msgid "Error occured while processing %s (NewFileDesc1)"
--#~ msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewFileDesc1)"
--
--#~ msgid "Error occured while processing %s (NewFileDesc2)"
--#~ msgstr "Wyst±pi³ b³±d podczas przetwarzania %s (NewFileDesc2)"
--
--#~ msgid "Wow, you exceeded the number of descriptions this APT is capable of."
--#~ msgstr ""
--#~ "Och, przekroczono liczbê opisów, któr± ten APT jest w stanie obs³u¿yæ."
--
--#~ msgid "Could not patch file"
--#~ msgstr "Nie uda³o siê na³o¿yæ ³atki na plik"
diff --combined po/pt.po
index c55fdbbd6,1dd54c727..d0943553e
--- a/po/pt.po
+++ b/po/pt.po
@@@ -1,160 -1,158 +1,170 @@@
  # Debian-PT translation for apt.
  # Copyright (C) 2004 Free Software Foundation, Inc.
  # Miguel Figueiredo <elmig@debianpt.org>, 2005, 2006.
 +#
 +#
  msgid ""
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-05-27 13:46+0200\n"
 -"PO-Revision-Date: 2005-03-07 22:20+0000\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
 +"PO-Revision-Date: 2006-10-14 21:55+0100\n"
  "Last-Translator: Rui Az. <astronomy@mail.pt>\n"
  "Language-Team: Portuguese <traduz@debianpt.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "O pacote %s versão %s tem uma dependência não satisfeita:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Impossível encontrar o pacote %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Total de Nomes de Pacotes : "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Pacotes Normais: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Pacotes Puramente Virtuais: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Pacotes Virtuais Únicos: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Pacotes Virtuais Misturados: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Faltam: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Total de Versões Distintas: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Total de Versões Distintas: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Total de Dependências: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Total de relações Ver/Ficheiro: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Total de relações Ver/Ficheiro: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Total de Mapeamentos Disponibilizados: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Total de Strings Globbed: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Total de espaço de Dependência de Versão: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Total de espaço Desperdiçado: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Total de Espaço Contabilizado: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "O ficheiro do pacote %s está dessincronizado."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Você deve dar exactamente um pattern"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Não foi encontrado nenhum pacote"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Ficheiros de Pacotes :"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  "A cache está dessincronizada, não pode x-referenciar um ficheiro de pacote"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Pacotes Marcados: "
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(não encontrado)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Instalado: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(nenhum)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Candidato: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Marcação do Pacote: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Tabela de Versão:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s para %s %s compilado em %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -303,7 -301,7 +313,7 @@@ msgstr "
  "  -c=? Ler este arquivo de configuração\n"
  "  -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Impossível escrever para %s"
@@@ -426,128 -424,115 +436,128 @@@ msgstr "Nenhuma selecção coincidiu
  msgid "Some files are missing in the package file group `%s'"
  msgstr "Alguns ficheiros faltam no ficheiro de grupo de pacotes `%s'"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "A base de dados estava corrompida, ficheiro renomeado para %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "DB é antiga, tentando uma actualização %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +"O formato DB é inválido. Se actualizou a partir de uma versão antiga do apt, "
 +"por favor remova-a e recrie a base de dados."
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "Não foi possível abrir o ficheiro DB %s: %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "Data do ficheiro mudou %s"
 +msgid "Failed to stat %s"
 +msgstr "Falha ao executar stat %s"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "O arquivo não tem registro de controle"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "Não foi possível obter um cursor"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "W: Não foi possível ler o directório %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "W: Não foi possível fazer stat %s\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "E: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "W: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "E: Erros aplicam-se ao ficheiro "
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "Falha ao resolver %s"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "Falhou ao percorrer a árvore"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "Falhou ao abrir %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr " DeLink %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "Falhou ao executar readlink %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "Falhou ao executar unlink %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** Falhou ao ligar %s a %s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " Limite DeLink de %sB atingido.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "Falha ao executar stat %s"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "Arquivo não possuía campo pacote"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr "  %s não possui entrada override\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "  maintainer de %s é %s, não %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr "  %s não possui fonte de entrada de 'override'\n"
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr "  %s não possui de igual modo entrada binária de 'override'\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -643,79 -628,79 +653,79 @@@ msgstr "Problema ao executar unlinking 
  msgid "Failed to rename %s to %s"
  msgstr "Falha ao renomear %s para %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "S"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Erro de compilação de regex - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "mas %s está instalado"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "mas %s está para ser instalado"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "mas não está instalável"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "mas é um pacote virtual"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "mas não está instalado"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "mas não vai ser instalado"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " ou"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Os seguintes NOVOS pacotes serão instalados:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Os seguintes pacotes serão REMOVIDOS:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Os seguintes pacotes serão mantidos em suas versões actuais:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Os seguintes pacotes serão actualizados:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Aos seguintes pacotes será feito o DOWNGRADE :"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Os seguintes pacotes mantidos serão mudados :"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (devido a %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -723,145 -708,145 +733,145 @@@ msgstr "
  "AVISO: Os seguintes pacotes essenciais serão removidos.\n"
  "Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu reinstalados, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu a que foi feito o downgrade, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu a remover e %lu não actualizados.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Corrigindo dependências..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " falhou."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Impossível corrigir dependências"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Impossível minimizar o conjunto de actualizações"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Feito"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "Você pode querer executar `apt-get -f install' para corrigir isso."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Dependências não satisfeitas. Tente utilizar -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "AVISO: Os seguintes pacotes não podem ser autenticados"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "Aviso de autenticação ultrapassado.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Instalar estes pacotes sem verificação [y/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Alguns pacotes não puderam ser autenticados"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Há problemas e -y foi usado sem --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Erro Interno, Ordering não terminou"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Impossível criar lock no directório de download"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "A lista de fontes não pôde ser lida."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  "Estranho.. Os tamanhos não coincidiram, escreva para apt@packages.debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "É necessário fazer o download de %sB/%sB de arquivos.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "É necessário fazer o download de %sB de arquivos.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr ""
  "Depois de descompactar, %sB adicionais de espaço em disco serão utilizados.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Impossível de determinar espaço livre em %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Você não possui espaço livre suficiente em %s."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "Trivial Only especificado mas essa não é uma operação trivial."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Sim, faça como eu digo!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -872,28 -857,28 +882,28 @@@ msgstr "
  "Para continuar escreva a frase '%s'\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Abortado."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Você deseja continuar [Y/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Falha ao obter %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Falhou o download de alguns ficheiros"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Download completo e em modo de apenas download"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -901,47 -886,47 +911,47 @@@ msgstr "
  "Impossível obter alguns arquivos, execute talvez apt-get update ou tente com "
  "--fix-missing?"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing e troca de mídia não são suportados actualmente"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Impossível corrigir os pacotes em falta."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Abortando a Instalação."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Nota, seleccionando %s em vez de %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr "Saltando %s, já está instalado e a actualização não está definida.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "O pacote %s não está instalado, então não será removido\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "O pacote %s é um pacote virtual disponibilizado por:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Instalado]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Você deve seleccionar explicitamente um para instalar."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -952,51 -937,51 +962,51 @@@ msgstr "
  "Isso pode significar que o pacote falta, ficou obsoleto ou\n"
  "está disponível somente a partir de outra fonte\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "No entanto, os seguintes pacotes substituem-no:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "O pacote %s não tem candidato para instalação"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr ""
  "A reinstalação de %s não é possível, o download do mesmo não pode ser "
  "feito.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s já é a versão mais recente.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Release '%s' para '%s' não foi encontrado"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Versão '%s' para '%s' não foi encontrada"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Versão seleccionada %s (%s) para %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "O comando update não leva argumentos"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Impossível criar lock no directório de listas"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1004,25 -989,25 +1014,44 @@@ msgstr "
  "Falhou o download de alguns ficheiros de índice, foram ignorados ou os "
  "antigos foram usados em seu lugar."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "A seguinte informação pode ajudar a resolver a situação:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Erro Interno, o solucionador de problemas estragou coisas"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Erro Interno, AllUpgrade estragou algo"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Impossível encontrar o pacote %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Nota, seleccionando %s para a expressão regular '%s'\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "Você deve querer executar `apt-get -f install' para corrigir isto:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1030,7 -1015,7 +1059,7 @@@ msgstr "
  "Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote "
  "(ou especifique uma solução)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1042,7 -1027,7 +1071,7 @@@ msgstr "
  "distribuição instável, que alguns pacotes requisitados ainda não foram \n"
  "criados ou foram tirados do Incoming."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1053,123 -1038,123 +1082,119 @@@ msgstr "
  "de\n"
  "bug sobre esse pacote."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "A seguinte informação pode ajudar a resolver a situação:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Pacotes estragados"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Os seguintes pacotes extra serão instalados:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Pacotes sugeridos :"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Pacotes recomendados :"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Calculando Actualização... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Falhou"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Pronto"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Erro Interno, o solucionador de problemas estragou coisas"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  "Deve-se especificar pelo menos um pacote para que se obtenha o código fonte"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Impossível encontrar um pacote de código fonte para %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Saltando ficheiro do qual já havia sido feito download '%s'\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Você não possui espaço livre suficiente em %s"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Preciso obter %sB/%sB de arquivos de código fonte.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Precisa obter %sB de arquivos de código fonte.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Obter Código Fonte %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Falha ao obter alguns arquivos."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr ""
  "Saltando a descompactação de pacote código fonte já descompactado em %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "O comando de descompactação '%s' falhou.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "O comando de compilação '%s' falhou.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "O processo filho falhou"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "Deve especificar pelo menos um pacote para verificar as dependências de "
  "compilação"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Impossível obter informações de dependências de compilação para %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s não tem dependências de compilação.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1178,7 -1163,7 +1203,7 @@@ msgstr "
  "a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não "
  "pôde ser encontrado"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1187,32 -1172,32 +1212,32 @@@ msgstr "
  "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão "
  "disponível do pacote %s pode satisfazer os requisitos de versão"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Falha ao satisfazer a dependência %s para %s: Pacote instalado %s é muito "
  "novo"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Falha ao satisfazer a dependência %s para %s: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Não foi possível satisfazer as dependências de compilação para %s."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Falha ao processar as dependências de compilação"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Módulos Suportados:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1397,19 -1382,19 +1422,19 @@@ msgstr "Juntando informação Disponív
  msgid "Failed to create pipes"
  msgstr "Falha ao criar pipes"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "Falha ao executar gzip "
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Arquivo corrompido"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Checksum do arquivo tar falhou, arquivo corrompido"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
@@@ -1554,9 -1539,9 +1579,9 @@@ msgid "The info and temp directories ne
  msgstr "Os directórios info e temp precisam estar no mesmo sistema de arquivos"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "A Ler Listas de Pacotes"
  
@@@ -1689,12 -1674,12 +1714,14 @@@ msgstr "Disco não encontrado
  msgid "File not found"
  msgstr "Arquivo não encontrado"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Falha ao executar stat"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Falha ao definir hora de modificação"
  
@@@ -1822,7 -1807,7 +1849,7 @@@ msgstr "Ligação de socket de dados ex
  msgid "Unable to accept connection"
  msgstr "Impossível aceitar ligação"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Problema fazendo o hash do ficheiro"
  
@@@ -1906,43 -1891,41 +1933,43 @@@ msgstr "Algo estranho aconteceu ao reso
  msgid "Unable to connect to %s %s:"
  msgstr "Impossível ligar a %s %s:"
  
 -#: methods/gpgv.cc:64
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:65
 +#, c-format
  msgid "Couldn't access keyring: '%s'"
 -msgstr "Não foi possível resolver '%s'"
 +msgstr "Não foi possível aceder à 'keyring': '%s'"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr ""
  "E: A lista de argumentos de Acquire::gpgv::Options é demasiado longa. A sair."
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
  "Erro interno: Assinatura válida, mas não foi possível determinar a impressão "
  "digital da chave?!"
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr "Pelo menos uma assinatura inválida foi encontrada."
  
 -#: methods/gpgv.cc:207
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:213
 +#, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 -msgstr " para verificar assinatura (gnupg instalado?)"
 +msgstr ""
 +"Não foi possível executar '%s' para verificar a assinatura (gnupg está "
 +"instalado?)"
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr "Erro desconhecido ao executar gpgv"
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
  msgstr "As seguintes assinaturas estavam inválidas:\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
@@@ -1950,86 -1933,86 +1977,86 @@@ msgstr "
  "As seguintes assinaturas não puderam ser verificadas porque a chave pública "
  "não está disponível:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Não foi possível abrir pipe para %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Erro de leitura do processo %s"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Aguardando por cabeçalhos"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Linha de cabeçalho errada"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "O servidor http enviou um cabeçalho de resposta inválido"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "O servidor http enviou um cabeçalho Conten-Length inválido"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "O servidor http enviou um cabeçalho Conten-Range inválido"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "Este servidor http possui suporte a range errado"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Formato de data desconhecido"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Select falhou."
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "A ligação expirou"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Erro gravando para ficheiro de saída"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Erro gravando para ficheiro"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Erro gravando para o ficheiro"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Erro lendo do servidor. O Remoto fechou a ligação"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Erro lendo do servidor"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Dados de cabeçalho errados"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Falhou a ligação"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Erro interno"
  
@@@ -2042,7 -2025,7 +2069,7 @@@ msgstr "Não é possível fazer mmap a 
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Impossível fazer mmap de %lu bytes"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Selecção %s não encontrada"
@@@ -2103,12 -2086,12 +2130,12 @@@ msgstr "Erro de sintaxe %s:%u: Directiv
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Erro de sintaxe %s:%u: Lixo extra no final do ficheiro"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Erro !"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Pronto"
@@@ -2241,93 -2224,93 +2268,110 @@@ msgstr "Problema removendo o link ao fi
  msgid "Problem syncing the file"
  msgstr "Problema sincronizando o ficheiro"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Cache de pacotes vazia"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "O ficheiro de cache de pacotes está corrompido"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "O ficheiro de cache de pacotes é de uma versão incompatível"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Este APT não suporta o Sistema de Versões '%s'"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "A cache de pacotes foi gerada para uma arquitectura diferente"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Depende"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Pré-Depende"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Sugere"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Recomenda"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Em Conflito"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Substitui"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Obsoleta"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "importante"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "requerido"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "padrão"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "opcional"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Construindo Árvore de Dependências"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Versões Candidatas"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Geração de Dependência"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Juntando informação Disponível"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Falhou ao abrir %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Falha ao escrever ficheiro %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Impossível o parse ao ficheiro de pacote %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Impossível o parse ao ficheiro de pacote %s (2)"
@@@ -2362,7 -2345,7 +2406,7 @@@ msgstr "Linha malformada %lu na lista d
  msgid "Opening %s"
  msgstr "Abrindo %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Linha %u é demasiado longa na lista de fontes %s."
@@@ -2399,7 -2382,7 +2443,7 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Tipo do ficheiro de índice '%s' não é suportado"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
@@@ -2407,7 -2390,7 +2451,7 @@@ msgstr "
  "O pacote %s precisa ser reinstalado, mas não foi possível encontrar um "
  "repositório para o mesmo."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2415,7 -2398,7 +2459,7 @@@ msgstr "
  "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
  "pacotes mantidos (hold)."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr "Impossível corrigir problemas, você manteve (hold) pacotes estragados."
  
@@@ -2432,14 -2415,14 +2476,14 @@@ msgstr "Falta o directório de repositÃ
  #. only show the ETA if it makes sense
  #. two days
  #: apt-pkg/acquire.cc:823
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li (%s remaining)"
 -msgstr "A efectuar download de ficheiro %li de %li (%s restantes)"
 +msgstr "A obter o ficheiro %li de %li (%s restantes)"
  
  #: apt-pkg/acquire.cc:825
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li"
 -msgstr "Lendo Listagem de Ficheiros"
 +msgstr "A obter o ficheiro %li·of·%li"
  
  #: apt-pkg/acquire-worker.cc:113
  #, c-format
@@@ -2457,12 -2440,12 +2501,12 @@@ msgid "Please insert the disc labeled: 
  msgstr ""
  "Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Sistema de empacotamento '%s' não é suportado"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr ""
  "Não foi possível determinar um tipo de sistema de empacotamento aplicável"
@@@ -2499,107 -2482,106 +2543,124 @@@ msgstr "Não foi possível entender o t
  msgid "No priority (or zero) specified for pin"
  msgstr "Nenhuma prioridade (ou zero) especificada para marcação"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "A Cache possui um sistema de versões incompatível"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Um erro ocorreu ao processar %s (NovoPacote)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Um erro ocorreu ao processar %s (UsePacote1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Um erro ocorreu ao processar %s (UsePacote2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Um erro ocorreu ao processar %s (NovaVersão1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Um erro ocorreu ao processar %s (UsePacote3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Um erro ocorreu ao processar %s (NovaVersão2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  "Uau, você excedeu o número de nomes de pacotes que este APT é capaz de "
  "suportar."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  "Uau, você excedeu o número de versões que este APT é capaz de suportar."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr ""
++"Uau, você excedeu o número de versões que este APT é capaz de suportar."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  "Uau, você excedeu o número de dependências que este APT é capaz de suportar."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Um erro ocorreu ao processar %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  "O pacote %s %s não foi encontrado ao processar as dependências de ficheiros"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Obtendo File Provides"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "Erro de I/O ao gravar a cache de código fonte"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "falhou renomear, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "MD5Sum incorreto"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr ""
  "Não existe qualquer chave pública disponível para as seguintes IDs de "
  "chave:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2609,7 -2591,7 +2670,7 @@@ msgstr "
  "que você precisa consertar manualmente este pacote. (devido a arquitectura "
  "não especificada)."
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2618,7 -2600,7 +2679,7 @@@ msgstr "
  "Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
  "que você precisa consertar manualmente este pacote."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
@@@ -2626,7 -2608,7 +2687,7 @@@ msgstr "
  "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
  "para o pacote %s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Tamanho incorrecto"
  
@@@ -2635,7 -2617,7 +2696,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "O bloco de fabricante %s não contém a impressão digital"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2644,47 -2626,47 +2705,49 @@@ msgstr "
  "Utilizando o ponto de montagem do CD-ROM %s\n"
  "A montar o CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "A identificar.. "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Label Guardada: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "A utilizar o mount point do CD-ROM %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "A desmontar o CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "A aguardar pelo disco...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "A montar o CD-ROM...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "A pesquisar os ficheiros de index do Disco..\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "Encontrou %i indexes de pacotes, %indexes de source e %i assinaturas\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Isso não é um nome válido, tente de novo.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2693,38 -2675,38 +2756,38 @@@ msgstr "
  "Este Disco tem o nome: \n"
  "'%s'\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "A copiar listas de pacotes..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "A escrever lista de novas source\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "As entradas de listas de Source para este Disco são:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "A desmontar o CD-ROM..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Escreveu %i registos.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Escreveu %i registos com %i ficheiros em falta.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2772,26 -2754,40 +2835,34 @@@ msgid "Removed %s
  msgstr "%s removido"
  
  #: apt-pkg/deb/dpkgpm.cc:378
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing to completely remove %s"
 -msgstr "A preparar para configurar %s"
 +msgstr "A preparar para remover completamente %s"
  
  #: apt-pkg/deb/dpkgpm.cc:379
 -#, fuzzy, c-format
 +#, c-format
  msgid "Completely removed %s"
 -msgstr "Falha ao remover %s"
 +msgstr "Remoção completa de %s"
 +
++#: methods/rred.cc:219
++#, fuzzy
++msgid "Could not patch file"
++msgstr "Não foi possível abrir ficheiro o %s"
+ 
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Conexão encerrada prematuramente"
  
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
++#: apt-pkg/acquire-item.cc:1097
++#, fuzzy
++msgid "There is no public key available for the following key IDs:\n"
+ msgstr ""
++"Não existe qualquer chave pública disponível para as seguintes IDs de "
++"chave:\n"
+ 
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr "  %s não possui entrada override\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr "  %s não possui entrada override\n"
 -
 -#: methods/rred.cc:219
 -#, fuzzy
 -msgid "Could not patch file"
 -msgstr "Não foi possível abrir ficheiro o %s"
 +#~ msgid "File date has changed %s"
 +#~ msgstr "Data do ficheiro mudou %s"
  
- #, fuzzy
- #~ msgid "Could not patch file"
- #~ msgstr "Não foi possível abrir ficheiro o %s"
- 
  #~ msgid "Reading file list"
  #~ msgstr "Lendo Lista de Ficheiros"
  
@@@ -2816,9 -2812,9 +2887,6 @@@
  #~ msgid "Error occured while processing %s (UsePackage2)"
  #~ msgstr "Um erro ocorreu ao processar %s (UsePacote2)"
  
--#~ msgid "Error occured while processing %s (NewFileVer1)"
--#~ msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)"
--
  #~ msgid "Error occured while processing %s (NewVersion1)"
  #~ msgstr "Um erro ocorreu ao processar %s (NovaVersão1)"
  
diff --combined po/pt_BR.po
index 3e4a5e0bf,20c24a68c..343a6ec61
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@@ -1,13 -1,13 +1,13 @@@
  # Brazilian Portuguese translation for apt.
  # Copyright (C) 2002 Free Software Foundation, Inc.
  # Gustavo Noronha Silva <kov@debian.org>, 2002.
 -# André Luís Lopes <andrelop@debian.org>, 2002-2005.
 +# Andre Luis Lopes <andrelop@debian.org>, 2002-2005.
  # Felipe Augusto van de Wiel (faw) <faw@cathedrallabs.org>, 2006.
  msgid ""
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-07-27 00:54+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2006-08-21 00:40-0300\n"
  "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@cathedrallabs.org>\n"
  "Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@@ -15,145 -15,145 +15,155 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "O pacote %s versão %s tem uma dependência desencontrada:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Impossível encontrar o pacote %s"
  
--#: cmdline/apt-cache.cc:232
 -msgid "Total package names: "
 -msgstr "Total de nomes de pacotes: "
++#: cmdline/apt-cache.cc:245
 +msgid "Total package names : "
 +msgstr "Total de Nomes de Pacotes : "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Pacotes normais: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Pacotes puramente virtuais: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Pacotes virtuais únicos: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Pacotes virtuais misturados: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Faltando: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Total de versões distintas: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Total de versões distintas: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Total de dependências: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Total de relações ver/arquivo: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Total de relações ver/arquivo: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Total de mapeamentos Provides: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Total de strings globbed: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Total de espaço de dependência de versão: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Total de espaço frouxo: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Total de espaço contabilizado: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "O arquivo de pacote %s está dessincronizado."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Você deve passar exatamente um padrão"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Nenhum pacote encontrado"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Arquivos de pacote:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "O cache está fora de sincronia, não posso x-ref um arquivo de pacote"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Pacotes pinados:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(não encontrado)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Instalado: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(nenhum)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Candidato: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Pin do pacote: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Tabela de versão:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s para %s %s compilado em %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -304,7 -304,7 +314,7 @@@ msgstr "
  "  -c=? Ler esse arquivo de configuração\n"
  "  -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Impossível escrever para %s"
@@@ -644,79 -644,79 +654,79 @@@ msgstr "Problema executando unlinking %
  msgid "Failed to rename %s to %s"
  msgstr "Falha ao renomear %s para %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "S"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Erro de compilação de regex - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Os pacotes a seguir têm dependências desencontradas:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "mas %s está instalado"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "mas %s está para ser instalado"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "mas não está instalável"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "mas é um pacote virtual"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "mas não está instalado"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "mas não vai ser instalado"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " ou"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Os NOVOS pacotes a seguir serão instalados:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Os pacotes a seguir serão REMOVIDOS:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Os pacotes a seguir serão atualizados:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Os pacotes a seguir serão REVERTIDOS:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Os seguintes pacotes mantidos serão mudados:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (por causa de %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -725,144 -725,144 +735,144 @@@ msgstr "
  "Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está "
  "fazendo!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu reinstalados, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu desatualizados, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu a serem removidos e %lu não atualizados.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Corrigindo dependências..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " falhou."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Impossível corrigir dependências"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Impossível minimizar o conjunto de atualizações"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Pronto"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "Você pode querer rodar `apt-get -f install' para corrigir isso."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Dependências desencontradas. Tente usar -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "Aviso de autenticação sobrescrito.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Instalar estes pacotes sem verificação [s/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Alguns pacotes não puderam ser autenticados"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Há problemas e -y foi usado sem --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Erro interno, Ordenação não finalizou"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Impossível criar lock no diretório de download"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "A lista de fontes não pôde ser lida."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr "Que estranho.. Os tamanhos não batem, informe apt@packages.debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "É preciso fazer o download de %sB/%sB de arquivos.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "É preciso fazer o download de %sB de arquivos.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr ""
  "Depois de desempacotar, %sB adicionais de espaço em disco serão usados.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Depois de desempacotar, %sB de espaço em disco serão liberados.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Não foi possível determinar o espaço livre em %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Você não possui espaço suficiente em %s."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "Trivial Only especificado mas essa não é uma operação trivial."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Sim, faça o que eu digo!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -873,28 -873,28 +883,28 @@@ msgstr "
  "Para continuar digite a frase '%s'\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Abortar."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Quer continuar [S/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Falha ao buscar %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Alguns arquivos falharam ao baixar"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Baixar completo e no modo somente baixar (\"download only\")"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -902,48 -902,48 +912,48 @@@ msgstr "
  "Impossível buscar alguns arquivos, talvez executar apt-get update ou tentar "
  "com --fix-missing?"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing e troca de mídia não são suportados atualmente"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Impossível corrigir pacotes faltosos."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Abortando instalação."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Nota, selecionando %s ao invés de %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  "Ignorando %s, já está instalado e a atualização não está configurada.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "O pacote %s não está instalado, então não será removido\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "O pacote %s é um pacote virtual provido por:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Instalado]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Você deve selecionar um explicitamente para instalar."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -954,49 -954,49 +964,49 @@@ msgstr "
  "Isso pode significar que o pacote está faltando, ficou obsoleto ou\n"
  "está disponível somente a partir de outra fonte\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "No entanto, os pacotes a seguir o substituem:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "O pacote %s não tem candidato para instalação"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "A reinstalação de %s não é possível, não pode ser baixado.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s já é a versão mais nova.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Release '%s' para '%s' não foi encontrada"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Versão '%s' para '%s' não foi encontrada"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Versão selecionada %s (%s) para %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "O comando update não leva argumentos"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Impossível criar lock no diretório de listas"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1004,25 -1004,25 +1014,44 @@@ msgstr "
  "Alguns arquivos de índice falharam para baixar, eles foram ignorados ou os "
  "antigos foram usados no lugar."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "A informação a seguir pode ajudar a resolver a situação:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Erro interno, o solucionador de problemas quebrou coisas"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Erro interno, AllUpgrade quebrou as coisas"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Impossível achar pacote %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Nota, selecionando %s para expressão regular '%s'\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "Você deve querer executar `apt-get -f install' para corrigir isso:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1030,7 -1030,7 +1059,7 @@@ msgstr "
  "Dependências desencontradas. Tente `apt-get -f install' sem nenhum pacote "
  "(ou especifique uma solução)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1042,7 -1042,7 +1071,7 @@@ msgstr "
  "distribuição instável, que alguns pacotes requeridos não foram\n"
  "criados ainda ou foram tirados do Incoming."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1052,121 -1052,121 +1081,117 @@@ msgstr "
  "esteja simplesmente não instalável e um relato de erro sobre esse\n"
  "pacotes deve ser enviado."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "A informação a seguir pode ajudar a resolver a situação:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Pacotes quebrados"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Os pacotes extra a seguir serão instalados:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Pacotes sugeridos:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Pacotes recomendados:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Calculando atualização... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Falhou"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Pronto"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Erro interno, o solucionador de problemas quebrou coisas"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Impossível encontrar um pacote fonte para %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Ignorando arquivo já obtido '%s'\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Você não possui espaço livre suficiente em %s"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Preciso obter %sB/%sB de arquivos fonte.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Precisa obter %sB de arquivos fonte.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Obter fonte %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Falha ao buscar alguns arquivos."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Ignorando desempacotamento de fonte já desempacotado em %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Comando de desempacotamento '%s' falhou.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Comando de construção '%s' falhou.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Processo filho falhou"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "Deve-se especificar pelo menos um pacote para que se cheque as dependências "
  "de construção"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Impossível conseguir informações de dependência de construção para %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s não tem dependências de construção.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1175,7 -1175,7 +1200,7 @@@ msgstr "
  "a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não "
  "pôde ser encontrado"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1184,32 -1184,32 +1209,32 @@@ msgstr "
  "a dependência de %s por %s não pôde ser satisfeita porque nenhuma versão "
  "disponível do pacote %s pôde satisfazer os requerimentos de versão"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Falha ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito "
  "novo"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Falha ao satisfazer dependência de %s por %s: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Não foi possível satisfazer as dependências de compilação para %s."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Falha ao processar as dependências de construção"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Módulos suportados:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1552,9 -1552,9 +1577,9 @@@ msgid "The info and temp directories ne
  msgstr "Os diretórios info e temp precisam estar no mesmo sistema de arquivos"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Lendo lista de pacotes"
  
@@@ -1688,12 -1688,13 +1713,14 @@@ msgstr "Disco não encontrado.
  msgid "File not found"
  msgstr "Arquivo não encontrado"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
+ #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
+ #: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Falha ao checar"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
+ #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
 -#: methods/rred.cc:240
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Falha ao definir hora de modificação"
  
@@@ -1821,7 -1822,7 +1848,7 @@@ msgstr "Conexão do socket de dados exp
  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:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Problema fazendo o hash do arquivo"
  
@@@ -1949,86 -1950,86 +1976,86 @@@ msgstr "
  "As assinaturas a seguir não puderam ser verificadas devido a chave pública "
  "não estar disponível:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Não foi possível abrir pipe para %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Erro de leitura do processo %s"
  
- #: methods/http.cc:376
+ #: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Aguardando por cabeçalhos"
  
- #: methods/http.cc:522
+ #: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
  
- #: methods/http.cc:530
+ #: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Linha de cabeçalho ruim"
  
- #: methods/http.cc:549 methods/http.cc:556
+ #: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
  
- #: methods/http.cc:585
+ #: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "O servidor HTTP enviou um cabeçalho Content-Length inválido"
  
- #: methods/http.cc:600
+ #: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "O servidor HTTP enviou um cabeçalho Content-Range inválido"
  
- #: methods/http.cc:602
+ #: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "Este servidor HTTP possui suporte a range quebrado"
  
- #: methods/http.cc:626
+ #: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Formato de data desconhecido"
  
- #: methods/http.cc:773
+ #: methods/http.cc:772
  msgid "Select failed"
  msgstr "Seleção falhou"
  
- #: methods/http.cc:778
+ #: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Conexão expirou"
  
- #: methods/http.cc:801
+ #: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Erro gravando para arquivo de saída"
  
- #: methods/http.cc:832
+ #: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Erro gravando para arquivo"
  
- #: methods/http.cc:860
+ #: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Erro gravando para o arquivo"
  
- #: methods/http.cc:874
+ #: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão"
  
- #: methods/http.cc:876
+ #: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Erro lendo do servidor"
  
- #: methods/http.cc:1107
+ #: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Dados de cabeçalho ruins"
  
- #: methods/http.cc:1124
+ #: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Conexão falhou"
  
- #: methods/http.cc:1215
+ #: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Erro interno"
  
@@@ -2041,7 -2042,7 +2068,7 @@@ msgstr "Não foi possível fazer mmap d
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Impossível fazer mmap de %lu bytes"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Seleção %s não encontrada"
@@@ -2102,12 -2103,12 +2129,12 @@@ msgstr "Erro de sintaxe %s:%u: Diretiv
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Erro de sintaxe %s:%u: Lixo extra no final do arquivo"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Erro!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Pronto"
@@@ -2240,93 -2241,93 +2267,110 @@@ msgstr "Problema removendo o link do ar
  msgid "Problem syncing the file"
  msgstr "Problema sincronizando o arquivo"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Cache de pacotes vazio"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "O arquivo de cache de pacotes está corrompido"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "O arquivo de cache de pacotes é uma versão incompatível"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Este APT não suporta o sistema de versões '%s'"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "O cache de pacotes foi gerado para uma arquitetura diferente"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Depende"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Pré-Depende"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Sugere"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Recomenda"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Conflita"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Substitui"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Obsoleta"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "importante"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "requerido"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "padrão"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "opcional"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Construindo árvore de dependências"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Versões candidatas"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Geração de dependência"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Mesclando informação disponível"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Falha ao abrir %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Falha ao gravar arquivo %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Impossível analisar arquivo de pacote %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:186
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Impossível analisar arquivo de pacote %s (2)"
@@@ -2362,7 -2363,7 +2406,7 @@@ msgstr "
  msgid "Opening %s"
  msgstr "Abrindo %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Linha %u muito longa na lista de fontes %s."
@@@ -2399,7 -2400,7 +2443,7 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Tipo de arquivo de índice '%s' não é suportado"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
@@@ -2407,7 -2408,7 +2451,7 @@@ msgstr "
  "O pacote %s precisa ser reinstalado, mas não foi possível encontrar um "
  "arquivo para o mesmo."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2415,7 -2416,7 +2459,7 @@@ msgstr "
  "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
  "pacotes mantidos (hold)."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados."
  
@@@ -2457,12 -2458,12 +2501,12 @@@ msgid "Please insert the disc labeled: 
  msgstr ""
  "Por favor, insira o disco nomeado: '%s' no leitor '%s' e pressione enter."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Sistema de empacotamento '%s' não é suportado"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr ""
  "Não foi possível determinar um tipo de sistema de empacotamento aplicável."
@@@ -2499,105 -2500,105 +2543,122 @@@ msgstr "Não foi possível entender o t
  msgid "No priority (or zero) specified for pin"
  msgstr "Nenhuma prioridade (ou zero) especificada para pin"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "O cache possui um sistema de versões incompatível"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Um erro ocorreu processando %s (NovoPacote)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Um erro ocorreu processando %s (UsePacote1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Um erro ocorreu processando %s (UsePacote2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Um erro ocorreu processando %s (NovaVersão1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Um erro ocorreu processando %s (UsePacote3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Um erro ocorreu processando %s (NovaVersão2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  "Uau, você excedeu o número de nomes de pacotes que este APT é capaz de "
  "suportar."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  "Uau, você excedeu o número de versões que este APT é capaz de suportar."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr ""
++"Uau, você excedeu o número de versões que este APT é capaz de suportar."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  "Uau, você excedeu o número de dependências que este APT é capaz de suportar."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Um erro ocorreu processando %s (ColetarArquivoProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  "Pacote %s %s não foi encontrado enquanto processando dependências de arquivo"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Não foi possível checar a lista de pacotes fonte %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Coletando Arquivo Provides"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "Erro de I/O ao gravar cache fonte"
  
- #: apt-pkg/acquire-item.cc:126
+ #: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "renomeação falhou, %s (%s -> %s)."
  
- #: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+ #: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
 -#: apt-pkg/acquire-item.cc:1373
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "MD5Sum incorreto"
  
- #: apt-pkg/acquire-item.cc:640
 -#: apt-pkg/acquire-item.cc:1068
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are 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:1181
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2607,7 -2608,7 +2668,7 @@@ msgstr "
  "que você precisa consertar manualmente este pacote. (devido a arquitetura "
  "não especificada)."
  
- #: apt-pkg/acquire-item.cc:812
 -#: apt-pkg/acquire-item.cc:1240
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2616,7 -2617,7 +2677,7 @@@ msgstr "
  "Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
  "que você precisa consertar manualmente este pacote."
  
- #: apt-pkg/acquire-item.cc:848
 -#: apt-pkg/acquire-item.cc:1276
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
@@@ -2624,7 -2625,7 +2685,7 @@@ msgstr "
  "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
  "para o pacote %s."
  
- #: apt-pkg/acquire-item.cc:935
 -#: apt-pkg/acquire-item.cc:1363
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Tamanho incorreto"
  
@@@ -2633,7 -2634,7 +2694,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Bloco Fornecedor %s não contém impressão digital (\"fingerprint\""
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2642,49 -2643,49 +2703,51 @@@ msgstr "
  "Usando ponto de montagem de CD-ROM %s\n"
  "Montando CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Identificando.. "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Rótulo armazenado: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Usando ponto de montagem de CD-ROM %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Desmontando CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Aguardando por disco...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Montando CD-ROM...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Procurando por arquivos de índice no disco..\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr ""
  "Encontrado(s) %i índice(s) de pacote(s), %i índice(s) de fonte(s) e %i "
  "assinaturas\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  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:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2693,38 -2694,38 +2756,38 @@@ msgstr "
  "Esse disco é chamado: \n"
  "'%s'\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Copiando lista de pacotes..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Gravando nova lista de fontes\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Entradas na lista de fontes para este disco são:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Desmontando CD-ROM..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Gravados %i registros.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Gravados %i registros com %i arquivos faltando.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Gravados %i registros com %i arquivos que não combinam\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2781,16 -2782,18 +2844,22 @@@ msgstr "Preparando para remover complet
  msgid "Completely removed %s"
  msgstr "%s completamente removido"
  
+ #: methods/rred.cc:219
+ msgid "Could not patch file"
+ msgstr "Não foi possível aplicar o patch"
+ 
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Conexão encerrada prematuramente"
  
 -#: cmdline/apt-cache.cc:232
 -msgid "Total package names : "
 -msgstr "Total de Nomes de Pacotes : "
++#: apt-pkg/acquire-item.cc:1097
++#, fuzzy
++msgid "There is no public key available for the following key IDs:\n"
++msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n"
++
 +#~ msgid "Total package names: "
 +#~ msgstr "Total de nomes de pacotes: "
  
- #~ msgid "Could not patch file"
- #~ msgstr "Não foi possível aplicar o patch"
- 
  #~ msgid "File date has changed %s"
  #~ msgstr "Data do arquivo mudou %s"
  
@@@ -2876,3 -2879,4 +2945,3 @@@
  #, fuzzy
  #~ msgid "Failed too stat %s"
  #~ msgstr "Impossível checar %s."
 -
diff --combined po/ro.po
index 0a4460d3e,908e25e6e..23df69436
--- a/po/ro.po
+++ b/po/ro.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
  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: 2006-09-12 11:18+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2006-09-19 01:35+0300\n"
  "Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
  "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@@ -16,145 -16,145 +16,155 @@@
  "X-Generator: KBabel 1.11.2\n"
  "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Pachetul %s versiunea %s are o dependenţă neîndeplinită:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Nu pot localiza pachetul %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Total nume pachete : "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Pachete normale: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Pachete virtuale pure: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Pachete virtuale singulare: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Pachete virtuale mixte: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Lipsă: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Total versiuni distincte: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Total versiuni distincte: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Total dependenţe: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Total relaţii versiune/fişier: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Total relaţii versiune/fişier: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Total cartări Furnizează: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Total şiruri înglobate: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Total spaţiu versiuni ale dependenţelor: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Total spaţiu intern: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Total spaţiu contorizat pentru: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Fişierul pachetului %s este desincronizat."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Trebuie să daţi exact un şablon"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Nu s-au găsit pachete"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Fişiere pachet: "
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "Cache este desincronizat, nu pot executa x-ref un fişier pachet"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Pachete alese special:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(negăsit)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Instalat: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(niciunul)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Candidează: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Pachet ales special: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Tabela de versiuni:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "        %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
--#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s pentru %s %s compilat pe %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -303,7 -303,7 +313,7 @@@ msgstr "
  "  -c=? Citeşte acest fişier de configurare\n"
  "  -o=? Ajustează o opţiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Nu pot scrie în %s"
@@@ -650,79 -650,79 +660,79 @@@ msgstr "Problemă la desfacerea %s
  msgid "Failed to rename %s to %s"
  msgstr "Eşuare în a redenumi %s în %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "Y"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Eroare de compilare expresie regulată - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Următoarele pachete au dependenţe neîndeplinite:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "dar %s este instalat"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "dar %s este pe cale de a fi instalat"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "dar nu este instalabil"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "dar este un pachet virtual"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "dar nu este instalat"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "dar nu este pe cale să fie instalat"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " sau"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Următoarele pachete NOI vor fi instalate:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Următoarele pachete vor fi ŞTERSE:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Următoarele pachete au fost reţinute:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Următoarele pachete vor fi ÎNNOITE:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Următoarele pachete vor fi DE-GRADATE:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Următoarele pachete ţinute vor fi schimbate:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (datorită %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -730,145 -730,145 +740,145 @@@ msgstr "
  "AVERTISMENT: Următoarele pachete esenţiale vor fi şterse.\n"
  "Aceasta NU ar trebui făcută decât dacă ştiţi exact ce vreţi!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu înnoite, %lu nou instalate, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu reinstalate, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu de-gradate, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu de şters şi %lu neînnoite.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu instalate sau şterse incomplet.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Corectez dependenţele..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " eşuare."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Nu pot corecta dependenţele"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Nu pot micşora mulţimea pachetelor de înnoire"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Terminat"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "Aţi putea să porniţi 'apt-get -f install' pentru a corecta acestea."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Dependenţe neîndeplinite. Încercaţi să folosiţi -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "Avertisment de autentificare înlocuit.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Instalaţi aceste pachete fără verificare [y/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Unele pachete n-au putut fi autentificate"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Sunt unele probleme şi -y a fost folosit fără --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Eroare internă, Ordering nu s-a terminat"
  
--#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Nu pot încuia directorul de descărcare"
  
--#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Lista surselor nu poate fi citită."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  "Ce ciudat.. Dimensiunile nu se potrivesc, scrieţi la apt@packages.debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Este nevoie să descărcaţi %sB/%sB de arhive.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Este nevoie să descărcaţi %sB de arhive.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "După despachetare va fi folosit %sB de spaţiu suplimentar pe disc.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "După despachetare va fi eliberat %sB din spaţiul de pe disc.\n"
  
--#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "N-am putut determina spaţiul disponibil în %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Nu aveţi suficient spaţiu în %s."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  "A fost specificat 'doar neimportant' dar nu este o operaţiune neimportantă."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Da, fă cum îţi spun!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -879,28 -879,28 +889,28 @@@ msgstr "
  "Pentru a continua tastaţi fraza '%s'\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Renunţare."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Vreţi să continuaţi [Y/n]? "
  
--#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Eşuare în aducerea %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Eşuare în descărcarea unor fişiere"
  
--#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Descărcare completă şi în modul doar descărcare"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -908,47 -908,47 +918,47 @@@ msgstr "
  "Nu pot aduce unele arhive, poate porniţi 'apt-get update' sau încercaţi cu --"
  "fix-missing?"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing şi schimbul de mediu nu este deocamdată suportat"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Nu pot corecta pachetele lipsă."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Abandonez instalarea."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Notă, se selectează %s în locul lui %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr "Sar peste %s, este deja instalat şi înnoirea nu este activată.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Pachetul %s nu este instalat, aşa încât nu este şters\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Pachetul %s este un pachet virtual furnizat de către:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Instalat]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Ar trebui să alegeţi în mod explicit unul pentru instalare."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -959,49 -959,49 +969,49 @@@ msgstr "
  "Aceasta ar putea însemna că pachetul lipseşte, s-a învechit, sau\n"
  "este disponibil numai din altă sursă\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Oricum următoarele pachete îl înlocuiesc:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Pachetul %s nu are nici un candidat la instalare"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s este deja la cea mai nouă versiune.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Release '%s' pentru '%s' n-a fost găsită"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Versiune selectată %s (%s) pentru %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "Comanda de actualizare nu are argumente"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Nu pot încuia directorul cu lista"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1009,25 -1009,25 +1019,45 @@@ msgstr "
  "Unele fişiere index au eşuat la descărcare, fie au fost ignorate, fie au "
  "fost folosite în loc unele vechi."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "Următoarele informaţii ar putea să vă ajute la rezolvarea situaţiei:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr ""
++"Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Nu pot găsi pachetul %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "AÅ£i putea porni 'apt-get -f install' pentru a corecta acestea:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1035,7 -1035,7 +1065,7 @@@ msgstr "
  "Dependenţe neîndeplinite. Încercaţi 'apt-get -f install' fără nici un pachet "
  "(sau oferiţi o altă soluţie)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1048,7 -1048,7 +1078,7 @@@ msgstr "
  "pachete\n"
  "cerute n-au fost create încă sau au fost mutate din Incoming."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1058,122 -1058,122 +1088,118 @@@ msgstr "
  " că pachetul pur şi simplu nu este instalabil şi un raport de eroare pentru\n"
  "acest pachet ar trebui completat."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "Următoarele informaţii ar putea să vă ajute la rezolvarea situaţiei:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Pachete deteriorate"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Următoarele extra pachete vor fi instalate:"
  
--#: cmdline/apt-get.cc:1692
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Pachete sugerate:"
  
--#: cmdline/apt-get.cc:1693
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Pachete recomandate:"
  
--#: cmdline/apt-get.cc:1713
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Calculez înnoirea... "
  
--#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Eşuare"
  
--#: cmdline/apt-get.cc:1721
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Terminat"
  
--#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr ""
  "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
  
--#: cmdline/apt-get.cc:1894
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "Trebuie specificat cel puţin un pachet pentru a-i aduce sursa"
  
--#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Nu pot găsi o sursă pachet pentru %s"
  
--#: cmdline/apt-get.cc:1968
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Sar peste fişierul deja descărcat '%s'\n"
  
--#: cmdline/apt-get.cc:1992
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Nu aveţi suficient spaţiu în %s"
  
--#: cmdline/apt-get.cc:1997
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Este nevoie să descărcaţi %sB/%sB din arhivele surselor.\n"
  
--#: cmdline/apt-get.cc:2000
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Este nevoie să descărcaţi %sB din arhivele surselor.\n"
  
--#: cmdline/apt-get.cc:2006
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Aducere sursa %s\n"
  
--#: cmdline/apt-get.cc:2037
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Eşuare în a aduce unele arhive."
  
--#: cmdline/apt-get.cc:2065
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Sar peste despachetarea sursei deja despachetate în %s\n"
  
--#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Comanda de despachetare '%s' eşuată.\n"
  
--#: cmdline/apt-get.cc:2078
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Verificaţi dacă pachetul 'dpkg-dev' este instalat.\n"
  
--#: cmdline/apt-get.cc:2095
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Comanda de construire '%s' eşuată.\n"
  
--#: cmdline/apt-get.cc:2114
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Eşuare proces copil"
  
--#: cmdline/apt-get.cc:2130
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "Trebuie specificat cel puţin un pachet pentru a-i verifica dependenţele "
  "înglobate"
  
--#: cmdline/apt-get.cc:2158
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Nu pot prelua informaţiile despre dependenţele înglobate ale lui %s"
  
--#: cmdline/apt-get.cc:2178
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s nu are dependenţe înglobate.\n"
  
--#: cmdline/apt-get.cc:2230
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1182,7 -1182,7 +1208,7 @@@ msgstr "
  "Dependenţa lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
  "poate fi găsit"
  
--#: cmdline/apt-get.cc:2282
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1191,32 -1191,32 +1217,32 @@@ msgstr "
  "Dependenţa lui %s de %s nu poate fi satisfăcută deoarece nici o versiune "
  "disponibilă a pachetului %s nu poate satisface versiunile cerute"
  
--#: cmdline/apt-get.cc:2317
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Eşuare în a satisface dependenţa lui %s de %s: Pachetul instalat %s este "
  "prea nou"
  
--#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Eşuare în a satisface dependenţa lui %s de %s: %s"
  
--#: cmdline/apt-get.cc:2356
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Dependenţele înglobate pentru %s nu pot fi satisfăcute."
  
--#: cmdline/apt-get.cc:2360
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Eşuare în a prelucra dependenţele înglobate"
  
--#: cmdline/apt-get.cc:2392
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Module suportate:"
  
--#: cmdline/apt-get.cc:2433
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1561,9 -1561,9 +1587,9 @@@ msgstr "
  "fişiere"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Citire liste de pachete"
  
@@@ -1696,12 -1696,12 +1722,14 @@@ msgstr "Disc negăsit.
  msgid "File not found"
  msgstr "Fişier negăsit"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:134
 -#: methods/gzip.cc:143
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Eşuare de determinare a stării"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:140
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Eşuare la ajustarea timpului"
  
@@@ -1829,7 -1829,7 +1857,7 @@@ msgstr "Timp de conectare data socket e
  msgid "Unable to accept connection"
  msgstr "Nu pot accepta conexiune"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Problemă la indexarea fişierului"
  
@@@ -1955,87 -1955,87 +1983,87 @@@ msgstr "
  "Următoarele semnături n-au putut fi verificate datorită cheii publice care "
  "este indisponibilă:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Nu pot deschide conexiunea pentru %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Eroare de citire din procesul %s"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "În aşteptarea antetelor"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Primit o singură linie de antet peste %u caractere"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Linie de antet necorespunzătoare"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "Serverul http a trimis un antet de răspuns necorespunzător"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "Serverul http a trimis un antet lungime-conţinut necorespunzător"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "Serverul http a trimis un antet zonă de conţinut necorespunzător"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "Acest server http are zonă de suport necorespunzătoare"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Format de date necunoscut"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Eşuarea selecţiei"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Timp de conectare expirat"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Eroare la scrierea fişierului de rezultat"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Eroare la scrierea în fişier"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Eroare la scrierea în fişierul"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr ""
  "Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Eroare la citirea de pe server"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Antet de date necorespunzător"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Conectare eşuată"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Eroare internă"
  
@@@ -2048,7 -2048,7 +2076,7 @@@ msgstr "Nu pot mmap un fişier gol
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Nu pot face mmap la %lu bytes"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Selecţia %s nu s-a găsit"
@@@ -2109,12 -2109,12 +2137,12 @@@ msgstr "Eroare de sintaxă %s:%u: direc
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare la sfârşitul fişierului"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Eroare!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Terminat"
@@@ -2247,93 -2247,93 +2275,110 @@@ msgstr "Problemă la dezlegarea fişier
  msgid "Problem syncing the file"
  msgstr "Problemă în timpul sincronizării fişierului"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Cache gol de pachet"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Cache-ul fişierului pachet este deteriorat"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Fişierul cache al pachetului este o versiune incompatibilă"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Acest APT nu suportă versioning system '%s'"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "Cache-ul pachetului a fost construit pentru o arhitectură diferită"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Depinde"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Pre-depinde"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Sugerează"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Recomandă"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Este în conflict"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Înlocuieşte"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Învechit"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "important"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "cerut"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "standard"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "opţional"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Se construieşte arborele de dependenţă"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Versiuni candidat"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Generare dependenţe"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Unirea informaţiilor disponibile"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Eşuare la deschiderea %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Eşuare în scrierea fişierului %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Nu pot analiza fişierul pachet %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:186
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Nu pot analiza fişierul pachet %s (2)"
@@@ -2368,7 -2368,7 +2413,7 @@@ msgstr "Linie greşită %lu în lista s
  msgid "Opening %s"
  msgstr "Deschidere %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Linia %u prea lungă în lista sursă %s."
@@@ -2405,14 -2405,14 +2450,14 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Tipul de fişier index '%s' nu este suportat"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  "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:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2420,7 -2420,7 +2465,7 @@@ msgstr "
  "Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi "
  "cauzată de pachete ţinute."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr "Nu pot corecta problema, aţi ţinut pachete deteriorate."
  
@@@ -2462,12 -2462,12 +2507,12 @@@ msgid "Please insert the disc labeled: 
  msgstr ""
  "Vă rog introduceţi discul numit: '%s' în unitatea '%s' şi apăsaţi Enter."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Sistemul de pachete '%s' nu este suportat"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Nu pot determina un tip de sistem de pachete potrivit"
  
@@@ -2504,107 -2504,106 +2549,124 @@@ msgstr "Nu s-a înţeles tipul de pin %
  msgid "No priority (or zero) specified for pin"
  msgstr "Fără prioritate (sau zero) specificată pentru pin"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Cache are un versioning system incompatibil"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Eroare apărută în timpul procesării %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Eroare apărută în timpul procesării %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Eroare apărută în timpul procesării %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Eroare apărută în timpul procesării %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Eroare apărută în timpul procesării %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Eroare apărută în timpul procesării %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  "Mamăăă, aţi depăşit numărul de nume de pachete de care este capabil acest "
  "APT."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  "Mamăăă, aţi depăşit numărul de versiuni de care este capabil acest APT."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr ""
++"Mamăăă, aţi depăşit numărul de versiuni de care este capabil acest APT."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  "Mamăăă, aţi depăşit numărul de dependenţe de care este capabil acest APT."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Eroare apărută în timpul procesării %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  "Nu s-a găsit pachetul %s %s în timpul procesării dependenţelor de fişiere"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Nu pot determina starea listei surse de pachete %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Colectare furnizori fişier"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "Eroare IO în timpul salvării sursei cache"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "redenumire eşuată, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "Nepotrivire MD5Sum"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr ""
  "Nu există nici o cheie publică disponibilă pentru următoarele "
  "identificatoare de chei:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2613,7 -2612,7 +2675,7 @@@ msgstr "
  "N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna "
  "că aveţi nevoie să reparaţi manual acest pachet (din pricina unui arch lipsă)"
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2622,7 -2621,7 +2684,7 @@@ msgstr "
  "N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna "
  "că aveţi nevoie să depanaţi manual acest pachet."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
@@@ -2630,7 -2629,7 +2692,7 @@@ msgstr "
  "Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la "
  "pachetul %s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Nepotrivire dimensiune"
  
@@@ -2639,7 -2638,7 +2701,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Blocul vânzător %s nu conţine amprentă"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2648,47 -2647,47 +2710,49 @@@ msgstr "
  "Utilizare puct de montare CD-ROM %s\n"
  "Montare CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Identificare.. "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Etichetă memorată: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Utilizare punct de montare CD-ROM %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Demontare CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Aştept discul...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Montez CD-ROM...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Scanez discul de fişierele index..\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "Găsite %i indexuri de pachete, %i indexuri de surse şi %i semnături\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Acesta nu este un nume valid, mai încercaţi.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2697,38 -2696,38 +2761,38 @@@ msgstr "
  "Acest disc este numit: \n"
  "'%s'\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Copiez listele de pachete.."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Scriere noua listă sursă\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Intrările listei surselor pentru acest disc sunt:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Demontez CD-ROM..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "S-au scris %i înregistrări.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "S-au scris %i înregistrări cu %i fişiere lipsă.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "S-au scris %i înregistrări cu %i fişiere nepotrivite\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2784,6 -2783,6 +2848,18 @@@ msgstr "Se pregăteşte ştergerea comp
  msgid "Completely removed %s"
  msgstr "Şters complet %s"
  
++#: methods/rred.cc:219
++#, fuzzy
++msgid "Could not patch file"
++msgstr "Nu pot deschide fişierul %s"
++
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Conexiune închisă prematur"
++
++#: apt-pkg/acquire-item.cc:1097
++#, fuzzy
++msgid "There is no public key available for the following key IDs:\n"
++msgstr ""
++"Nu există nici o cheie publică disponibilă pentru următoarele "
++"identificatoare de chei:\n"
diff --combined po/ru.po
index 2e7488d4b,e29c287f6..fe26bb63b
--- a/po/ru.po
+++ b/po/ru.po
@@@ -1,6 -1,5 +1,6 @@@
 -# translation of apt_po_ru.po to Russian
 +# translation of apt_ru.po to Russian
  # Russian messages for the apt suite.
 +#
  # Vadim Kutchin <amadis@chemi.komisc.ru>, 2002.
  # Ilgiz Kalmetev <ilgiz@bashtelecom.ru>, 2002.
  # Tichomir Koryakov <Tichomir.Koryakov@usu.ru>, 2002.
@@@ -8,161 -7,162 +8,171 @@@
  # Dmitry Astapov <adept@umc.com.ua>, 2004.
  # Dmitry Astapov <adept@despammed.com>, 2004.
  # Yuri Kozlov <kozlov.y@gmail.com>, 2004, 2005, 2006.
 -#
  msgid ""
  msgstr ""
 -"Project-Id-Version: apt_po_ru\n"
 +"Project-Id-Version: 0.6.46.2\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-05-27 13:46+0200\n"
 -"PO-Revision-Date: 2006-01-21 14:55+0300\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
 +"PO-Revision-Date: 2006-10-16 21:53+0400\n"
  "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
  "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
 -"X-Generator: KBabel 1.9.1\n"
 +"X-Generator: KBabel 1.11.2\n"
  "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
  "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
  "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Пакет %s версии %s имеет неудовлетворённую зависимость:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Не могу найти пакет %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Всего имён пакетов : "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Нормальных пакетов: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Чисто виртуальных пакетов: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Одиночных виртуальных пакетов: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Смешанных виртуальных пакетов: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Пропущено: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Всего уникальных версий: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Всего уникальных версий: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Всего зависимостей: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Всего отношений Версия/Файл: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Всего отношений Версия/Файл: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Всего отношений Provides: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Всего развёрнутых строк: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Всего информации о зависимостях: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Пустого места в кэше: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Общее пространство посчитанное для: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Список пакетов %s рассинхронизирован."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Вы должны задать ровно один шаблон"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Не найдено ни одного пакета"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Списки пакетов:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "Кэш рассинхронизирован, невозможно обнаружить ссылку на список пакетов"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Зафиксированные пакеты:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(не найдено)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Установлен: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(отсутствует)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Кандидат: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Фиксатор пакета: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Таблица версий:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s для %s %s скомпилирован %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -308,7 -308,7 +318,7 @@@ msgstr "
  "  -c=? Читать указанный конфигурационный файл\n"
  "  -o=? Указать произвольную опцию, к примеру, -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Невозможно записать в %s"
@@@ -440,132 -440,119 +450,132 @@@ msgstr "Совпадений не обÐ
  msgid "Some files are missing in the package file group `%s'"
  msgstr "В группе пакетов `%s' отсутствуют некоторые файлы"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "БД была повреждена, файл переименован в %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "DB устарела, попытка обновить %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +"Неправильный формат базы данных (DB). Если вы производили обновление apt, "
 +"удалите и пересоздайте базу данных."
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "Не удалось открыть DB файл %s: %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "Дата файла %s изменилась"
 +msgid "Failed to stat %s"
 +msgstr "Не удалось получить атрибуты %s"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "В архиве нет поля control"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "Невозможно получить курсор"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "W: Не удалось прочитать каталог %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "W: Не удалось прочитать атрибуты %s\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "E: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "W: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "E: Ошибки относятся к файлу '"
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "Не удалось проследовать по ссылке %s"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "Не удалось совершить обход дерева"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "Не удалось открыть %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr "DeLink %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "Не удалось прочесть ссылку %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "Не удалось удалить %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** Не удалось создать ссылку %s на %s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " Превышен лимит в %sB в DeLink.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "Не удалось получить атрибуты %s"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "В архиве нет поля package"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr "  Нет записи о переназначении (override) для %s\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "  пакет %s сопровождает %s, а не %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr "  Нет записи source override для %s\n"
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr "  Нет записи binary override для %s\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
 -msgstr "Внутренняя ошибка, не могу найти составную часть %s"
 +msgstr "Внутренняя ошибка, не удалось найти составную часть %s"
  
  #: ftparchive/contents.cc:353 ftparchive/contents.cc:384
  msgid "realloc - Failed to allocate memory"
@@@ -658,80 -645,80 +668,80 @@@ msgstr "Не удалось удалиÑ
  msgid "Failed to rename %s to %s"
  msgstr "Не удалось переименовать %s в %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "д"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Ошибка компиляции регулярного выражения - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Пакеты, имеющие неудовлетворённые зависимости:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "но %s уже установлен"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "но %s будет установлен"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "но он не может быть установлен"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "но это виртуальный пакет"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "но он не установлен"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "но он не будет установлен"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " или"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "НОВЫЕ пакеты, которые будут установлены:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Пакеты, которые будут УДАЛЕНЫ:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Пакеты, которые будут оставлены в неизменном виде:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Пакеты, которые будут обновлены:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr ""
  "Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (вследствие %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -739,151 -726,151 +749,151 @@@ msgstr "
  "ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n"
  "НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "обновлено %lu, установлено %lu новых пакетов, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "переустановлено %lu переустановлено, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu пакетов заменены на старые версии, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "не установлено до конца или удалено %lu пакетов.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Исправление зависимостей..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " не удалось."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Невозможно скорректировать зависимости"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Невозможно минимизировать набор обновлений"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Готово"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr ""
  "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -"
  "f install'."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "Аутентификационное предупреждение не принято в внимание.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Установить эти пакеты без проверки [y/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Некоторые пакеты невозможно аутентифицировать"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Существуют проблемы, а опция -y использована без --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr ""
  "Внутренняя ошибка, InstallPackages была вызвана с неработоспособными "
  "пакетами!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Пакеты необходимо удалить, но удаление запрещено."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Внутренняя ошибка, Ordering не завершилась"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Невозможно заблокировать каталог для загрузки"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Не читается перечень источников."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr "Странно.. Несовпадение размеров, напишите на apt@packages.debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Необходимо скачать %sB/%sB архивов.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Необходимо скачать %sБ архивов.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr ""
  "После распаковки объем занятого дискового пространства возрастёт на %sB.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr ""
  "После распаковки объем занятого дискового пространства уменьшится на %sB.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Не удалось определить количество свободного места в %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Недостаточно свободного места в %s."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  "Запрошено выполнение только тривиальных операций, но это не тривиальная "
  "операция."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Да, делать, как я скажу!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -894,28 -881,28 +904,28 @@@ msgstr "
  "Чтобы продолжить, введите фразу: '%s'\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Аварийное завершение."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Хотите продолжить [Д/н]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Не удалось загрузить %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Некоторые файлы не удалось загрузить"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Указан режим \"только загрузка\", и загрузка завершена"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -923,48 -910,48 +933,48 @@@ msgstr "
  "Невозможно загрузить некоторые архивы, вероятно надо запустить apt-get "
  "update или попытаться повторить запуск с ключом --fix-missing"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing и смена носителя в данный момент не поддерживаются"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Невозможно исправить ситуацию с пропущенными пакетами."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Аварийное завершение установки."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Заметьте, вместо %2$s выбирается %1$s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  "Пропускается %s - пакет уже установлен, и опция upgrade не установлена.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Пакет %s не установлен, поэтому не может быть удалён\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Пакет %s - виртуальный, его функции предоставляются пакетами:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Установлен]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Вы должны явно указать, какой именно вы хотите установить."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -975,49 -962,49 +985,49 @@@ msgstr "
  "Это может означать, что пакет отсутствует, устарел, или доступен из "
  "источников, не упомянутых в sources.list\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Однако следующие пакеты могут его заменить:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Для пакета %s не найдены кандидаты на установку"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "Переустановка %s невозможна, он не загружается.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "Уже установлена самая новая версия %s.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Релиз '%s' для '%s' не найден"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Версия '%s' для '%s' не найдена"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Выбрана версия %s (%s) для %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "Команде update не нужны аргументы"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Невозможно заблокировать каталог со списками пакетов"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1025,27 -1012,27 +1035,46 @@@ msgstr "
  "Некоторые индексные файлы не загрузились, они были проигнорированы или "
  "вместо них были использованы старые версии"
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "Следующая информация возможно поможет Вам:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Внутренняя ошибка, решатель проблем всё поломал"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Внутренняя ошибка, AllUpgrade все поломал"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Не могу найти пакет %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Заметьте, регулярное выражение %2$s приводит к выбору %1$s\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr ""
  "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -"
  "f install':"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1053,7 -1040,7 +1082,7 @@@ msgstr "
  "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', "
  "не указывая имени пакета, (или найдите другое решение)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1064,7 -1051,7 +1093,7 @@@ msgstr "
  "или же используете нестабильного дистрибутив, и запрошенные Вами пакеты\n"
  "ещё не созданы или были удалены из Incoming."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1074,125 -1061,125 +1103,121 @@@ msgstr "
  "пакет просто не может быть установлен из-за ошибок в самом пакете.\n"
  "Необходимо послать отчёт об этой ошибке."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "Следующая информация возможно поможет Вам:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Сломанные пакеты"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Будут установлены следующие дополнительные пакеты:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Предлагаемые пакеты:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Рекомендуемые пакеты:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Расчёт обновлений... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Неудачно"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Готово"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Внутренняя ошибка, решатель проблем всё поломал"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  "Укажите как минимум один пакет, для которого необходимо загрузить исходные "
  "тексты"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Невозможно найти пакет с исходными текстами для %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Пропускаем уже загруженный файл '%s'\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Недостаточно места в %s"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Нужно загрузить %sB архивов с исходными текстами.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Загрузка исходных текстов %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Некоторые архивы не удалось загрузить."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr ""
  "Распаковка исходных текстов пропущена, так как в %s уже находятся "
  "распакованные исходные тексты\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Команда распаковки '%s' завершилась неудачно.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Команда сборки '%s' завершилась неудачно.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Порождённый процесс завершился неудачно"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "Для проверки зависимостей для сборки необходимо указать как минимум один "
  "пакет"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Невозможно получить информацию о зависимостях для сборки %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s не имеет зависимостей для сборки.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1201,7 -1188,7 +1226,7 @@@ msgstr "
  "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
  "найден"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1210,32 -1197,32 +1235,32 @@@ msgstr "
  "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из "
  "версий пакета %s не удовлетворяет требованиям"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
  "пакет %s новее, чем надо"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Зависимости для сборки %s не могут быть удовлетворены."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Обработка зависимостей для сборки завершилась неудачно"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Поддерживаемые модули:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1418,19 -1405,19 +1443,19 @@@ msgstr "Объединение инфо
  msgid "Failed to create pipes"
  msgstr "Не удалось создать порождённые процессы"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "Не удалось выполнить gzip "
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Повреждённый архив"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Неправильная контрольная сумма Tar, архив повреждён"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Неизвестный заголовок в архиве TAR. Тип %u, элемент %s"
@@@ -1575,9 -1562,9 +1600,9 @@@ msgid "The info and temp directories ne
  msgstr "Каталоги info и temp должны находиться на одной файловой системе"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Чтение списков пакетов"
  
@@@ -1709,12 -1696,12 +1734,14 @@@ msgstr "Диск не найден.
  msgid "File not found"
  msgstr "Файл не найден"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Не удалось получить атрибуты"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Не удалось установить время модификации"
  
@@@ -1846,7 -1833,7 +1873,7 @@@ msgstr "Время установлен
  msgid "Unable to accept connection"
  msgstr "Невозможно принять соединение"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Проблема при хэшировании файла"
  
@@@ -1931,128 -1918,128 +1958,128 @@@ msgstr "
  msgid "Unable to connect to %s %s:"
  msgstr "Невозможно соединиться с %s %s:"
  
 -#: methods/gpgv.cc:64
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:65
 +#, c-format
  msgid "Couldn't access keyring: '%s'"
 -msgstr "Не могу найти IP адрес для %s"
 +msgstr "Нет доступа к связке (keyring) ключей: '%s'"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr ""
  "E: Слишком большой список параметров у Acquire::gpgv::Options. Завершение "
  "работы."
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
  "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток "
  "ключа?!"
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr "Найдена как минимум одна неправильная подпись."
  
 -#: methods/gpgv.cc:207
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:213
 +#, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 -msgstr "для проверки подписи (gnupg установлена?)"
 +msgstr "Не удалось выполнить '%s' для проверки подписи (gnupg установлена?)"
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr "Неизвестная ошибка при выполнении gpgv"
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
  msgstr "Следующие подписи неверные:\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
  msgstr ""
  "Следующие подписи не могут быть проверены, так как недоступен общий ключ:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Не удалось открыть канал для %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Ошибка чтения из процесса %s"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Ожидание заголовков"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Получен заголовок длиннее %u символов"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Неверный заголовок"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "Http-сервер послал неверный заголовок"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "Http сервер послал неверный заголовок Content-Length"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "Http-сервер послал неверный заголовок Content-Range"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Неизвестный формат данных"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Ошибка в select"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Время ожидания для соединения истекло"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Ошибка записи в выходной файл"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Ошибка записи в файл"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Ошибка записи в файл"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Ошибка чтения, удалённый сервер прервал соединение"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Ошибка чтения с сервера"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Неверный заголовок данных"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Соединение разорвано"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Внутренняя ошибка"
  
@@@ -2065,7 -2052,7 +2092,7 @@@ msgstr "Невозможно отобр
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Невозможно отобразить в память %lu байт"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Не найдено: %s"
@@@ -2127,12 -2114,12 +2154,12 @@@ 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:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Ошибка!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Готово"
@@@ -2270,93 -2257,93 +2297,110 @@@ msgstr "Ошибка при удалеÐ
  msgid "Problem syncing the file"
  msgstr "Проблема при синхронизации файловых буферов с диском"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Кэш пакетов пуст"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Кэш пакетов повреждён"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Не поддерживаемая версия кэша пакетов"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Данный APT не поддерживает Систему Версий '%s'"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "Кэш пакетов был собран для другой архитектуры"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Зависит"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "ПредЗависит"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Предлагает"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Рекомендует"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Конфликтует"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Заменяет"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Замещает"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "важный"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "необходимый"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "стандартный"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "необязательный"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "дополнительный"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Построение дерева зависимостей"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Версии-кандидаты"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Генерирование зависимостей"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Объединение информации о доступных пакетах"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Не удалось открыть %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Не удалось записать в файл %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Невозможно прочесть содержимое пакета %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Невозможно прочесть содержимое пакета %s (2)"
@@@ -2392,7 -2379,7 +2436,7 @@@ msgstr "Искажённая строк
  msgid "Opening %s"
  msgstr "Открытие %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Строка %u в списке источников %s слишком длинна."
@@@ -2429,13 -2416,13 +2473,13 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Не поддерживается индексный файл типа '%s'"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr "Пакет %s нуждается в переустановке, но я не могу найти архив для него."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2443,7 -2430,7 +2487,7 @@@ msgstr "
  "Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это "
  "может быть вызвано отложенными (held) пакетами."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr "Невозможно исправить ошибки, у Вас отложены (held) битые пакеты."
  
@@@ -2460,14 -2447,14 +2504,14 @@@ msgstr "Архивный каталоÐ
  #. only show the ETA if it makes sense
  #. two days
  #: apt-pkg/acquire.cc:823
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li (%s remaining)"
  msgstr "Загружается файл %li из %li (%s осталось)"
  
  #: apt-pkg/acquire.cc:825
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li"
 -msgstr "Чтение списков файлов в пакете"
 +msgstr "Загружается файл %li из %li"
  
  #: apt-pkg/acquire-worker.cc:113
  #, c-format
@@@ -2484,12 -2471,12 +2528,12 @@@ msgstr "Метод %s запустилÑ
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr "Вставьте диск с меткой '%s' в устройство '%s' и нажмите ввод."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Менеджер пакетов '%s' не поддерживается"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Невозможно определить подходящий тип менеджера пакетов"
  
@@@ -2523,100 -2510,99 +2567,116 @@@ msgstr "Неизвестный тип Ñ
  msgid "No priority (or zero) specified for pin"
  msgstr "Для фиксации не указан приоритет (или указан нулевой)"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Кэш имеет несовместимую систему версий"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Произошла ошибка во время обработки %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Произошла ошибка во время обработки %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Произошла ошибка во время обработки %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Произошла ошибка во время обработки %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Произошла ошибка во время обработки %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Произошла ошибка во время обработки %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Произошла ошибка во время обработки %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Произошла ошибка во время обработки %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Произошла ошибка во время обработки %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr "Превышено допустимое количество имён пакетов."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "Превышено допустимое количество версий."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "Превышено допустимое количество версий."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr "Превышено допустимое количество зависимостей."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Произошла ошибка во время обработки %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Произошла ошибка во время обработки %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "Во время обработки файла зависимостей не найден пакет %s %s"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Не удалось получить атрибуты списка пакетов с исходными текстами %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Сбор информации о Provides"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "Ошибка ввода/вывода при попытке сохранить кэш исходных текстов"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "переименовать не удалось, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "MD5Sum не совпадает"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr "Недоступен общий ключ для следующих ключей (ID):\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2625,7 -2611,7 +2685,7 @@@ msgstr "
  "Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам "
  "придётся вручную исправить этот пакет (возможно, пропущен arch)"
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2634,13 -2620,13 +2694,13 @@@ msgstr "
  "Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам "
  "придётся вручную исправить этот пакет."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Не совпадает размер"
  
@@@ -2649,7 -2635,7 +2709,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Блок поставщика %s не содержит отпечатка (fingerprint)"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2658,49 -2644,49 +2718,51 @@@ msgstr "
  "В качестве точки монтирования CD-ROM используется %s\n"
  "Монтируется CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Идентификация.. "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Найдена метка: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Использование %s в качестве точки монтирования CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Размонтирование CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Ожидание операции работы с диском...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Монтирование CD-ROM...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Поиск на диске индексных файлов..\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr ""
  "Найдено индексов: %i для пакетов, %i для пакетов c исходными текстами\n"
  "и %i для сигнатур\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Это неправильное имя, попробуйте ещё раз.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2709,38 -2695,38 +2771,38 @@@ msgstr "
  "Название диска: \n"
  "'%s'\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Копирование списков пакетов..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Запись нового списка источников\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Записи в списке источников для этого диска:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Размонтирование CD-ROM..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Сохранено %i записей.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Сохранено %i записей с %i отсутствующими файлами.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Сохранено %i записей с %i несовпадающими файлами\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2788,15 -2774,48 +2850,25 @@@ msgid "Removed %s
  msgstr "Удалён %s"
  
  #: apt-pkg/deb/dpkgpm.cc:378
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing to completely remove %s"
 -msgstr "Подготавливается для конфигурации %s"
 +msgstr "Подготовка к полному удалению %s"
  
  #: apt-pkg/deb/dpkgpm.cc:379
 -#, fuzzy, c-format
 +#, c-format
  msgid "Completely removed %s"
 -msgstr "Не удалось удалить %s"
 -
 -#: methods/rsh.cc:330
 -msgid "Connection closed prematurely"
 -msgstr "Соединение закрыто преждевременно"
 -
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
 -msgstr ""
 -
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr "  Нет записи о переназначении (override) для %s\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr "  Нет записи о переназначении (override) для %s\n"
 +msgstr "%s полностью удалён"
  
+ #: methods/rred.cc:219
+ #, fuzzy
+ msgid "Could not patch file"
+ msgstr "Не могу открыть файл %s"
+ 
 -#~ msgid "Reading file list"
 -#~ msgstr "Чтение списка файлов в пакете"
 -
 -#~ msgid "Could not execute "
 -#~ msgstr "Не удалось выполнить "
 -
 -#~ msgid "Preparing for remove with config %s"
 -#~ msgstr "Подготавливается для удаления вместе с настройками %s"
 +#: methods/rsh.cc:330
 +msgid "Connection closed prematurely"
 +msgstr "Соединение закрыто преждевременно"
+ 
 -#~ msgid "Removed with config %s"
 -#~ msgstr "Удалён вместе с настройками %s"
++#: apt-pkg/acquire-item.cc:1097
++#, fuzzy
++msgid "There is no public key available for the following key IDs:\n"
++msgstr "Недоступен общий ключ для следующих ключей (ID):\n"
diff --combined po/sk.po
index 04c1826b1,8ca6426af..d9e076249
--- a/po/sk.po
+++ b/po/sk.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-08-09 16:17+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2006-09-10 18:50+0200\n"
  "Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
  "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@@ -15,145 -15,145 +15,155 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Balík %s verzie %s má nesplnené závislosti:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Balík %s sa nedá nájsť"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Celkom názvov balíkov: "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Normálnych balíkov: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Čisto virtuálnych balíkov: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Jednoduchých virtuálnych balíkov: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Zmiešaných virtuálnych balíkov: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Chýbajúcich: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Celkom rôznych verzií: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Celkom rôznych verzií: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Celkom závislostí: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Celkom vzťahov ver/súbor: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Celkom vzťahov ver/súbor: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Celkom poskytnutých mapovaní: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Celkom globovaných reťazcov: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Celkom miesta závislých verzií: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Celkom jalového miesta: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Celkom priradeného miesta: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Súbor balíkov %s je neaktuálny."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Musíte zadať práve jeden vzor"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Neboli nájdené žiadne balíky"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Súbory balíka:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "Cache je neaktuálna, nedá sa odvolať na súbor balíka"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Pripevnené balíky:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(nenájdené)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Nainštalovaná verzia: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(žiadna)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Kandidát: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Pripevnený balík:"
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Tabuľka verzií:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2380 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s pre %s %s skompilovaný na %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -300,7 -300,7 +310,7 @@@ msgstr "
  "  -c=? Načíta tento konfiguračný súbor\n"
  "  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Do %s sa nedá zapisovať"
@@@ -639,79 -639,79 +649,79 @@@ msgstr "Problém s odlinkovaním %s
  msgid "Failed to rename %s to %s"
  msgstr "Premenovanie %s na %s zlyhalo"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "Y"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Chyba pri preklade regulárneho výrazu - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Nasledovné balíky majú nesplnené závislosti:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "ale nainštalovaný je %s"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "ale inštalovať sa bude %s"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "ale sa nedá nainštalovať"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "ale je to virtuálny balík"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "ale nie je nainštalovaný"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "ale sa nebude inštalovať"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " alebo"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Nainštalujú sa nasledovné NOVÉ balíky:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Nasledovné balíky sa ODSTRÁNIA:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Nasledovné balíky sa aktualizujú:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Nasledovné balíky sa DEGRADUJÚ:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Nasledovné pridržané balíky sa zmenia:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (kvôli %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -719,145 -719,145 +729,145 @@@ msgstr "
  "UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n"
  "Ak presne neviete, čo robíte, tak to NEROBTE!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu aktualizovaných, %lu nových inštalovaných, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu reinštalovaných, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu degradovaných, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu na odstránenie a %lu neaktualizovaných.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Opravujú sa závislosti..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " zlyhalo."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Závislosti sa nedajú opraviť"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Sada pre aktualizáciu sa nedá minimalizovať"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Hotovo"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "Na opravu môžete spustiť `apt-get -f install'."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Nesplnené závislosti. Skúste použiť -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "Upozornenie o vierohodnosti bolo potlačené.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Nainštalovať tieto nekontrolované balíky [y/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Nastali problémy a -y bolo použité bez --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Vnútorná chyba, Triedenie sa neukončilo"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Adresár pre sťahovanie sa nedá zamknúť"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2128
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Nedá sa načítať zoznam zdrojov."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  "Nezvyčajná udalosť... Veľkosti nesúhlasia, pošlite e-mail na apt@packages."
  "debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Je potrebné stiahnuť %sB/%sB archívov.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Je potrebné stiahnuť %sB archívov.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "Po rozbalení sa na disku použije ďalších %sB.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Po rozbalení sa na disku uvoľní %sB.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Na %s nemáte dostatok voľného miesta."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "Zadané 'iba triviálne', ale toto nie je triviálna operácia."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Áno, urob to, čo vravím!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -868,28 -868,28 +878,28 @@@ msgstr "
  "Pre pokračovanie opíšte frázu '%s'\n"
  " ?]"
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Prerušené."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Chcete pokračovať [Y/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2025
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Zlyhalo stiahnutie %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Niektoré súbory sa nedajú stiahnuť"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2034
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Sťahovanie ukončené v režime \"iba stiahnuť\""
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -897,47 -897,47 +907,47 @@@ msgstr "
  "Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --"
  "fix-missing"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing a výmena média nie sú momentálne podporované"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Chýbajúce balíky sa nedajú opraviť."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Inštalácia sa prerušuje."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Poznámka: %s sa vyberá namiesto %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr "Preskakuje sa %s, pretože je už nainštalovaný.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Balík %s nie je nainštalovaný, nedá sa teda odstrániť\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Balík %s je virtuálny balík poskytovaný:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr "[Inštalovaný]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Mali by ste explicitne vybrať jeden na inštaláciu."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -947,49 -947,49 +957,49 @@@ msgstr "
  "Balík %s nie je dostupný, ale odkazuje naň iný balík. Možno to znamená,\n"
  "že balík chýba, bol zrušený, alebo je dostupný iba z iného zdroja\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Avšak nahrádzajú ho nasledovné balíky:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Balík %s nemá kandidáta na inštaláciu"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "Nie je možná reinštalácia %s, pretože sa nedá stiahnuť.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s je už najnovšej verzie.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Nebolo nájdené vydanie '%s' pre '%s'"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Nebola nájdená verzia '%s' pre '%s'"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Zvolená verzia %s (%s) pre %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "Príkaz update neprijíma žiadne argumenty"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Adresár zoznamov sa nedá zamknúť"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -997,25 -997,25 +1007,44 @@@ msgstr "
  "Niektoré indexové súbory sa nepodarilo stiahnuť, boli ignorované, alebo sa "
  "použili staršie verzie."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Vnútorná chyba, problem resolver pokazil veci"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Balík %s sa nedá nájsť"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Poznámka: vyberá sa %s pre regulárny výraz '%s'\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "Na opravu nasledovných môžete spustiť `apt-get -f install':"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1023,7 -1023,7 +1052,7 @@@ msgstr "
  "Nesplnené závislosti. Skúste spustiť 'apt-get -f install' bez balíkov (alebo "
  "navrhnite riešenie)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1035,7 -1035,7 +1064,7 @@@ msgstr "
  "požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n"
  "Novoprichádzajúcich (Incoming) balíkov."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1045,128 -1045,128 +1074,124 @@@ msgstr "
  "balík nie je inštalovateľný a mali by ste zaslať hlásenie o chybe\n"
  "(bug report) pre daný balík."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Poškodené balíky"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Nainštalujú sa nasledovné extra balíky:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1685
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Navrhované balíky:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1686
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Odporúčané balíky:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1706
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Prepočítava sa aktualizácia... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Chyba"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1714
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Hotovo"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Vnútorná chyba, problem resolver pokazil veci"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1887
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1917 cmdline/apt-get.cc:2146
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Nedá sa nájsť zdrojový balík pre %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1961
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Preskakuje sa už stiahnutý súbor '%s'\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1985
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Na %s nemáte dostatok voľného miesta"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1990
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1993
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Je potrebné stiahnuť %sB zdrojových archívov.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1999
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Stiahnuť zdroj %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2030
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Zlyhalo stiahnutie niektorých archívov."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2058
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2070
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2071
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Skontrolujte, či je nainštalovaný balík 'dpkg-dev'.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2088
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Príkaz pre zostavenie '%s' zlyhal.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2107
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Proces potomka zlyhal"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2123
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na "
  "zostavenie"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2151
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Nedajú sa získať závislosti pre zostavenie %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2171
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s nemá žiadne závislosti pre zostavenie.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2223
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr "%s závislosť pre %s sa nemôže splniť, pretože sa nedá nájsť balík %s"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2275
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1175,31 -1175,31 +1200,31 @@@ msgstr "
  "%s závislosť pre %s sa nedá splniť, protože sa nedá nájsť verzia balíku %s, "
  "ktorá zodpovedá požiadavke na verziu"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2310
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2335
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2349
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Závislosti pre zostavenie %s sa nedajú splniť."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2353
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Spracovanie závislostí pre zostavenie zlyhalo"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2385
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Podporované moduly:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2426
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1536,9 -1536,9 +1561,9 @@@ msgid "The info and temp directories ne
  msgstr "Adresáre info a temp musia byť na tom istom súborovom systéme"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Načítavajú sa zoznamy balíkov"
  
@@@ -1671,12 -1671,12 +1696,14 @@@ msgstr "Disk sa nenašiel.
  msgid "File not found"
  msgstr "Súbor sa nenašiel"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
+ #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Vyhodnotenie zlyhalo"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
+ #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Zlyhalo nastavenie času zmeny"
  
@@@ -1804,7 -1804,7 +1831,7 @@@ msgstr "Uplynulo spojenie dátového so
  msgid "Unable to accept connection"
  msgstr "Spojenie sa nedá prijať"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Problém s hashovaním súboru"
  
@@@ -1929,86 -1929,86 +1956,86 @@@ msgstr "
  "Nasledovné signatúry sa nedajú overiť, pretože nie je dostupný verejný "
  "kľúč:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Nedá sa otvoriť rúra pre %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Chyba pri čítaní z procesu %s"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Čaká sa na hlavičky"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Získal sa jeden riadok hlavičky cez %u znakov"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Chybná hlavička"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "HTTP server poslal neplatnú hlavičku odpovede"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "HTTP server poslal neplatnú hlavičku Content-Length"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "HTTP server poslal neplatnú hlavičku Content-Range"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "Tento HTTP server má poškodenú podporu rozsahov"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Neznámy formát dátumu"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Výber zlyhal"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Uplynul čas spojenia"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Chyba zápisu do výstupného súboru"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Chyba zápisu do súboru"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Chyba zápisu do súboru"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Chyba pri čítaní zo servera"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Zlé dátové záhlavie"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Spojenie zlyhalo"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Vnútorná chyba"
  
@@@ -2021,7 -2021,7 +2048,7 @@@ msgstr "Nedá sa vykonať mmap prázdne
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Nedá sa urobiť mmap %lu bajtov"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Voľba %s nenájdená"
@@@ -2082,12 -2082,12 +2109,12 @@@ msgstr "Syntaktická chyba %s:%u: Nepod
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Syntaktická chyba %s:%u: Na konci súboru sú chybné údaje"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Chyba!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Hotovo"
@@@ -2219,93 -2219,93 +2246,110 @@@ msgstr "Problém pri odstraňovaní sú
  msgid "Problem syncing the file"
  msgstr "Problém pri synchronizovaní súboru"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Vyrovnávacia pamäť balíkov je prázdna"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Súbor vyrovnávacej pamäti balíkov je poškodený"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Súbor vyrovnávacej pamäti balíkov je nezlučiteľnej verzie"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Tento APT nepodporuje systém pre správu verzií '%s'"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "Súbor vyrovnávacej pamäti balíkov bol vytvorený pre inú architektúru"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Závisí na"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Predzávisí na"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Navrhuje"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Odporúča"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Koliduje s"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Nahrádza"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Zneplatňuje"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "dôležitý"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "požadovaný"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "štandartný"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "voliteľný"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Vytvára sa strom závislostí"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Kandidátske verzie"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Generovanie závislostí"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Zlučujú sa dostupné informácie"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "%s sa nedá otvoriť"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Zápis súboru %s zlyhal"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Súbor %s sa nedá spracovať (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:186
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Súbor %s sa nedá spracovať (2)"
@@@ -2340,7 -2340,7 +2384,7 @@@ msgstr "Skomolený riadok %lu v zoznam
  msgid "Opening %s"
  msgstr "Otvára sa %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý."
@@@ -2376,13 -2376,13 +2420,13 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Indexový typ súboru '%s' nie je podporovaný"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr "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:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2390,7 -2390,7 +2434,7 @@@ msgstr "
  "Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené "
  "pridržanými balíkmi."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  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."
  
@@@ -2431,12 -2431,12 +2475,12 @@@ msgstr "Spôsob %s nebol správne spust
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr "Vložte disk nazvaný '%s' do mechaniky '%s' a stlačte Enter."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Balíčkovací systém '%s' nie je podporovaný"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Nedá sa určiť vhodný typ balíčkovacieho systému"
  
@@@ -2470,102 -2470,101 +2514,118 @@@ msgstr "Nezrozumiteľné pripevnenie ty
  msgid "No priority (or zero) specified for pin"
  msgstr "Pre pripevnenie nebola zadaná žiadna (alebo nulová) priorita"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Chyba pri spracovávaní %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Chyba pri spracovávaní %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Chyba pri spracovávaní %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Chyba pri spracovávaní %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Chyba pri spracovávaní %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Chyba pri spracovávaní %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Chyba pri spracovávaní %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Chyba pri spracovávaní %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Chyba pri spracovávaní %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  "Fíha, prekročili ste počet názvov balíkov, ktoré toto APT zvládne spracovať."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "Fíha, prekročili ste počet verzií, ktoré toto APT zvládne spracovať."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "Fíha, prekročili ste počet verzií, ktoré toto APT zvládne spracovať."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  "Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Chyba pri spracovávaní %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Chyba pri spracovávaní %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "Pri spracovaní závislostí nebol nájdený balík %s %s"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Collecting File poskytuje"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "premenovanie zlyhalo, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "Nezhoda MD5 súčtov"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2574,7 -2573,7 +2634,7 @@@ msgstr "
  "Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je "
  "potrebné opraviť manuálne (kvôli chýbajúcej architektúre)."
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2583,13 -2582,13 +2643,13 @@@ msgstr "
  "Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík "
  "manuálne."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Veľkosti sa nezhodujú"
  
@@@ -2598,7 -2597,7 +2658,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Blok výrobcu %s neobsahuje otlačok (fingerprint)"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2607,48 -2606,48 +2667,50 @@@ msgstr "
  "Použije sa CD-ROM prípojný bod %s\n"
  "Pripája sa CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Identifikuje sa.."
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Uložená menovka: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Použije sa CD-ROM prípojný bod %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "CD-ROM sa odpája\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Čaká sa na disk...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Pripája sa CD-ROM...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Na disku sa hľadajú indexové súbory..\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr ""
  "Nájdených %i indexov balíkov, %i indexov zdrojových balíkov a %i signatúr\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Neplatný názov, skúste znova.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2657,38 -2656,38 +2719,38 @@@ msgstr "
  "Názov tohto disku je: \n"
  "'%s'\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Kopírujú sa zoznamy balíkov..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Zapisuje sa nový zoznam zdrojov\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Položky zoznamu zdrojov pre tento disk sú:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "CD-ROM sa odpája..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Zapísaných %i záznamov.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n"
@@@ -2743,13 -2742,13 +2805,19 @@@ msgstr "Pripravuje sa úplné odstráne
  msgid "Completely removed %s"
  msgstr "Balík '%s' je úplne odstránený"
  
++#: methods/rred.cc:219
++#, fuzzy
++msgid "Could not patch file"
++msgstr "Súbor %s sa nedá otvoriť súbor"
++
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Spojenie bolo predčasne ukončené"
  
++#: apt-pkg/acquire-item.cc:1097
++#, fuzzy
++msgid "There is no public key available for the following key IDs:\n"
++msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n"
++
  #~ msgid "File date has changed %s"
  #~ msgstr "Dátum súboru sa zmenil %s"
--
--#, fuzzy
--#~ msgid "Could not patch file"
--#~ msgstr "Súbor %s sa nedá otvoriť súbor"
diff --combined po/sl.po
index 902bb7842,2e4b22c0f..e570fe741
--- a/po/sl.po
+++ b/po/sl.po
@@@ -4,153 -4,153 +4,163 @@@ msgid "
  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: 2006-05-27 13:46+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2005-02-16 22:18+0100\n"
 -"Last-Translator: Jure Èuhalev <gandalf@owca.info>\n"
 +"Last-Translator: Jure Cuhalev <gandalf@owca.info>\n"
  "Language-Team: Slovenian <sl@li.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=ISO-8859-2\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Paket %s razlièica %s ima nere¹ene odvisnosti:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Ne najdem paketa %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Vseh imen paketov:"
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr " Navadni paketi:"
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr " Èisti navidezni paketi:"
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr " Posamezni navidezni paketi:"
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr " Me¹ani navidezni paketi:"
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr " Manjka: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Vseh razlièic:"
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Vseh razlièic:"
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Vseh odvisnosti:"
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Vseh povezava Raz/Dat:"
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Vseh povezava Raz/Dat:"
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Vseh dobljenih preslikav: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Vseh raz¹irjenih nizov: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Celotna velikost z odvisnostmi: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Celotna ohlapna velikost: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Celotna velikost, izraèunana za: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Paketna datoteka %s ni usklajena."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Podati morate natanèno en vzorec"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Nobena datoteka ni bila najdena"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Paketne datoteke:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "Predpomnilnik ni usklajen, x-ref paketne datotek ni mogoè"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Pripeti paketi:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(ni najden)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Name¹èen: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(brez)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr " Kandidat:"
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr " Zaponka paketa:"
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr " Tabela razlièic:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s za %s %s preveden na %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -301,7 -301,7 +311,7 @@@ msgstr "
  "  -c=? Prebere podano datoteko z nastavitvami\n"
  "  -o=? Nastavi poljubno nastavitveno mo¾nost, npr. -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Ni mogoèe pisati na %s"
@@@ -424,126 -424,115 +434,126 @@@ msgstr "Nobena izbira se ne ujema
  msgid "Some files are missing in the package file group `%s'"
  msgstr "Nekatere datoteke manjkajo v skupini paketnih datotek '%s'"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "ZP je pokvarjena, datoteka je preimenovana v %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "ZP je stara, posku¹am nadgraditi %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "Ni mogoèe odprti datoteke ZP %s: %s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "Datum datoteke se je spremenil %s"
 +msgid "Failed to stat %s"
 +msgstr "Napaka pri postavitvi %s"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "Arhiv nima nadzornega zapisa"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "Ni mogoèe najti kazalca"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "O: ni mogoèe brati imenika %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "O: Ni mogoèe nastaviti %s\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "E: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "O: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "N: Napake se sklicujejo na datoteko"
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "Ni mogoèe razre¹iti %s"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "Hoja drevesa ni uspela"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "Ni mogoèe odprti %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr " RazVe¾i %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "Napaka pri branju povezave %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "Napaka pri odvezovanju %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** Napaka pri povezovanju %s z %s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " Dose¾ena meja RazVezovanja %sB.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "Napaka pri postavitvi %s"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "Arhiv ni imel polja s paketom"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr " %s nima prekrivnega vnosa\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr " Vzdr¾evalec %s je %s in ne %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, fuzzy, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr " %s nima prekrivnega vnosa\n"
 +
 +#: ftparchive/writer.cc:627
 +#, fuzzy, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr " %s nima prekrivnega vnosa\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -639,79 -628,79 +649,79 @@@ msgstr "Napaka pri odvezovanju %s
  msgid "Failed to rename %s to %s"
  msgstr "Ni mogoèe preimenovati %s v %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "Y"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Napaka pri prevajanju regex - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Naslednji paketi imajo nere¹ene odvisnosti:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "vendar je paket %s name¹èen"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "vendar bo paket %s name¹èen"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "vendar se ga ne da namestiti"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "vendar je navidezen paket"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "vendar ni name¹èen"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "vendar ne bo name¹èen"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " ali"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Naslednji NOVI paketi bodo name¹èeni:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Naslednji paketi so bili zadr¾ani:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Naslednji paketi bodo nadgrajeni:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Naslednji paketi bodo POSTARANI:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Naslednji zadr¾ani paketi bodo spremenjeni:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (zaradi %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  #, fuzzy
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
@@@ -720,144 -709,144 +730,144 @@@ msgstr "
  "OPOZORILO: Naslednji kljuèni paketi bodo odstranjeni.\n"
  "To NI priporoèljivo, razen èe natanèno veste, kaj poènete."
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu nadgrajenih, %lu na novo name¹èenih, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu posodobljenih, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu postaranih, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu ne popolnoma name¹èenih ali odstranjenih.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Popravljanje odvisnosti ..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " spodletelo."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Ni mogoèe popraviti odvisnosti"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Ni mogoèe pomanj¹ati zbirke za nadgradnjo"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Opravljeno"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "Èe ¾elite popraviti napake, poskusite pognati 'apt-get -f install'."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Nere¹ene odvisnosti. Poskusite uporabiti -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "POZORO: Naslednjih paketov ni bilo mogoèe avtenticirati!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr ""
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Namestim te pakete brez prevejanje [y/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Nisem uspel avtenticirati nekaterih paketkov"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Pri¹lo je do te¾av in -y je bil uporabljen brez --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr ""
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoèeno."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  #, fuzzy
  msgid "Internal error, Ordering didn't finish"
  msgstr "Notranja napaka pri dodajanju odklona"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Ni mogoèe zakleniti imenika za prenose"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Seznama virov ni mogoèe brati."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Potrebno je dobiti %sB/%sB arhivov.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Potrebno je dobiti %sB arhivov.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Po odpakiranju bo spro¹èenega %sB prostora na disku.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, fuzzy, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Nimate dovolj prostora na %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "V %s je premalo prostora."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "Izbrana je mo¾nost Samo preprosto, a to opravilo ni preprosto."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Da, naredi tako kot pravim!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, fuzzy, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -868,28 -857,28 +878,28 @@@ msgstr "
  "Za nadaljevanje vnesite frazo '%s'\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Prekini."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Ali ¾elite nadaljevati [Y/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Ni mogoèe dobiti %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Prenos nekaterih datotek ni uspel"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Prenos dokonèan in uporabljen naèin samo prenos"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -897,47 -886,47 +907,47 @@@ msgstr "
  "Nekaterih arhivov ni mogoèe dobiti. Poskusite uporabiti apt-get update ali --"
  "fix-missing."
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing in izmenjava medija trenutno nista podprta"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Ni mogoèe popraviti manjkajoèih paketov."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Prekinjanje namestitve."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Opomba: izbran %s namesto %s \n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr "%s preskoèen, ker je ¾e name¹èen in ne potrebuje nadgradnje.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Paket %s ni name¹èen, zato ni odstranjen\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Paket %s je navidezen in ga je priskrbel:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Name¹èeno]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Sami izberite paket, ki ga ¾elite namestiti."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -948,49 -937,49 +958,49 @@@ msgstr "
  "To ponavadi pomeni, da paket manjka, je zastaran ali\n"
  "pa je na voljo samo iz drugega vira.\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Kakorkoli, naslednji paketi ga nadomestijo:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Paket %s nima kandidata za namestitev"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "Ponovna namestitev %s ni mo¾na, ker ni mo¾en prenos.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "Najnovej¹a razlièica %s je ¾e name¹èena.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Izdaje '%s' za '%s' ni mogoèe najti"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Razlièice '%s' za '%s' ni mogoèe najti"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Izbrana razlièica %s (%s) za %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "Ukaz update ne potrebuje argumentov"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Imenika seznamov ni mogoèe zakleniti"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -998,25 -987,25 +1008,44 @@@ msgstr "
  "Nekaterih kazal ni mogoèe prenesti, zato so preklicana, ali pa so "
  "uporabljena starej¹a."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "Naslednji podatki vam bodo morda pomagali re¹iti te¾avo:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Notranja napaka zaradi AllUpgrade."
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Notranja napaka zaradi AllUpgrade."
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Ni mogoèe najti paketa %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Opomba: izbran %s namesto regex '%s'\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "Poskusite zagnati 'apt-get -f install', èe ¾elite popraviti:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1024,7 -1013,7 +1053,7 @@@ msgstr "
  "Nere¹ene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
  "podajte re¹itev)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1035,7 -1024,7 +1064,7 @@@ msgstr "
  "nemogoè polo¾aj, èe uporabljate nestabilno izdajo pa, da nekateri zahtevani "
  "paketi ¹e niso ustvarjeni ali prene¹eni iz Prihajajoèe."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1045,130 -1034,130 +1074,126 @@@ msgstr "
  "preprosto ne da namestiti in je potrebno vlo¾iti poroèilo o hro¹èu\n"
  "o tem paketu."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "Naslednji podatki vam bodo morda pomagali re¹iti te¾avo:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Pokvarjeni paketi"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Naslednji dodatni paketi bodo name¹èeni:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Predlagani paketi:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Priporoèeni paketi:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Preraèunavanje nadgradnje ... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Spodletelo"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Opravljeno"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  #, fuzzy
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Notranja napaka zaradi AllUpgrade."
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  "Potrebno je navesti vsaj en paket, za katerega ¾elite dobiti izorno kodo"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Izvornega paketa za %s ni mogoèe najti"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:2043
  #, fuzzy, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Odpakiranje ¾e odpakiranih izvornih paketov v %s preskoèeno\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Nimate dovolj prostora na %s"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Dobi vir %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Nekaterih arhivov ni mogoèe dobiti."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Odpakiranje ¾e odpakiranih izvornih paketov v %s preskoèeno\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Ukaz gradnje '%s' ni uspel.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Otro¹ki proces ni uspel"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "Potrebno je navesti vsaj en paket, za katerega ¾elite preveriti odvisnosti "
  "za gradnjo"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Ni mogoèe dobiti informacij o odvisnostih za gradnjo za %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s nima odvisnosti za gradnjo.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr "%s odvisnosti za %s ni mogoèe zadostiti, ker ni mogoèe najti paketa %s"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1177,31 -1166,31 +1202,31 @@@ msgstr "
  "%s odvisnosti za %s ni mogoèe zadostiti, ker nobena razlièica paketa %s ne "
  "more zadostiti zahtevi po razlièici"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Ni mogoèe zadostiti %s odvisnosti za %s. Name¹èen paket %s je preveè nov"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Ni mogoèe zadostiti %s odvisnosti za %s. %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Odvisnostim za gradnjo %s ni mogoèe zadostiti."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Obdelava odvisnosti za gradnjo ni uspela"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Podprti moduli:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1383,19 -1372,19 +1408,19 @@@ msgstr "Spajanje informacij na voljo
  msgid "Failed to create pipes"
  msgstr "Ni mogoèe ustvariti pip"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "Ni mogoèe izvesti gzip"
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Pokvarjen arhiv"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Kontrolna vsota tar ni uspela, arhiv je pokvarjen"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Neznan tip glave TAR %u, èlan %s"
@@@ -1540,9 -1529,9 +1565,9 @@@ msgid "The info and temp directories ne
  msgstr "Podatki in zaèasni imeniki morajo biti v istem datoteènem sistemu"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Branje seznama paketov"
  
@@@ -1675,12 -1664,12 +1700,14 @@@ msgstr "Datoteke ni mogoèe najti
  msgid "File not found"
  msgstr "Datoteke ni mogoèe najti"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Doloèitev ni uspela"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Nastavitev èasa spremembe ni uspela"
  
@@@ -1808,7 -1797,7 +1835,7 @@@ msgstr "Povezava podatkovne vtiènice po
  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:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Te¾ava pri razpr¹evanju datoteke"
  
@@@ -1892,124 -1881,124 +1919,124 @@@ msgstr "Pri¹lo je do napake pri razre¹e
  msgid "Unable to connect to %s %s:"
  msgstr "Ni se mogoèe povezati z %s %s:"
  
 -#: methods/gpgv.cc:64
 +#: methods/gpgv.cc:65
  #, fuzzy, c-format
  msgid "Couldn't access keyring: '%s'"
  msgstr "Ni mogoèe razre¹iti '%s'"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr ""
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr ""
  
 -#: methods/gpgv.cc:207
 +#: methods/gpgv.cc:213
  #, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
  msgstr ""
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr ""
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  #, fuzzy
  msgid "The following signatures were invalid:\n"
  msgstr "Naslednji dodatni paketi bodo name¹èeni:"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
  msgstr ""
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Ni mogoèe odprti %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Napaka pri branju iz procesa %s"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Èakanje na glave"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Dobljena je ena vrstica glave preko %u znakov"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Napaèna vrstica glave"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "Stre¾nik HTTP je poslal napaèno glavo odgovora"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  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:599
  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:601
  msgid "This HTTP server has broken range support"
  msgstr "Ta stre¾nik HTTP ima pokvarjen obseg podpore"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Neznana oblika datuma"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Izbira ni uspela"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Èas za povezavo se je iztekel"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Napaka pri pisanju v izhodno datoteko"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Napaka pri pisanju v datoteko"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Napaka pri pisanju v datoteko"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Napaka pri branju oddaljene in zaprte povezave s stre¾nika "
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Napaka pri branju s stre¾nika"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Napaèni podatki glave"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Povezava ni uspela"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Notranja napaka"
  
@@@ -2022,7 -2011,7 +2049,7 @@@ msgstr "mmap prazne datoteke ni mogoè
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Ni mogoèe narediti mmap %lu bajtov"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Izbira %s ni mogoèe najti"
@@@ -2083,12 -2072,12 +2110,12 @@@ msgstr "Skladenjska napaka %s:%u: Nepod
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Skladenjska napaka %s:%u: Dodatno smetje na koncu datoteke"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s ... Napaka!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Narejeno"
@@@ -2220,93 -2209,93 +2247,110 @@@ msgstr "Te¾ava pri odvezovanju datoteke
  msgid "Problem syncing the file"
  msgstr "Te¾ava pri usklajevanju datoteke"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Prazen predpomnilnik paketov"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Datoteka s predpomnilnikom paketov je pokvarjena"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Razlièica datoteke s predpomnilnikom paketov ni ustrezna"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Ta APT ne podpira sistema razlièic '%s'"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "Predpomnilnik paketov je bil zgrajen za drugaèno arhitekturo"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Odvisen od"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Predodvisnost"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Priporoèa"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Priporoèa"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "V sporu z"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Zamenja"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Zastarani"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "pomembno"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "obvezno"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "standardno"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "izbirno"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "dodatno"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Gradnja drevesa odvisnosti"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Razlièice kandidatov"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Ustvarjanje odvisnosti"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Spajanje informacij na voljo"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Ni mogoèe odprti %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Napaka pri pisanju datoteke %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Ni mogoèe razèleniti paketne datoteke %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Ni mogoèe razèleniti paketne datoteke %s (2)"
@@@ -2341,7 -2330,7 +2385,7 @@@ msgstr "Napaèna vrstica %lu v seznamu v
  msgid "Opening %s"
  msgstr "Odpiram %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Vrstica %u v seznamu virov %s je predolga."
@@@ -2377,14 -2366,14 +2421,14 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  "Paket %s mora biti ponovno name¹èen, vendar ne morem najti arhiva zanj."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2392,7 -2381,7 +2436,7 @@@ msgstr "
  "Napaka. pkgProblemResolver::Napake pri razre¹itvi, ki so jih morda "
  "povzroèili zadr¾ani paketi."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr "Ni mogoèe popraviti te¾av. Imate zadr¾ane pakete."
  
@@@ -2436,12 -2425,12 +2480,12 @@@ msgstr "
  " '%s'\n"
  "v enoto '%s' in pritisnite enter\n"
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Paketni sistem '%s' ni podprt"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Ni mogoèe ugotoviti ustrezne vrste paketnega sistema"
  
@@@ -2475,99 -2464,99 +2519,115 @@@ msgstr "Ni mogoèe razumeti vrste zaponk
  msgid "No priority (or zero) specified for pin"
  msgstr "Prioriteta zaponke ni doloèena ali pa je niè."
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Predpomnilnik ima neustrezen sistem razlièic"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Pri¹lo je do napake pri obdelavi %s (Nov paket)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Pri¹lo je do napake pri obdelavi %s (Uporabi paket 1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica datoteke 1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Pri¹lo je do napake pri obdelavi %s (Uporabi paket 2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica datoteke 1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica 1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Pri¹lo je do napake pri obdelavi %s (Uporabi paket 3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica 2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Pri¹lo je do napake pri obdelavi %s (Nova razlièica datoteke 1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr "Uau, presegli ste ¹tevilo imen paketov, ki jih zmore APT."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "Uau, presegli ste ¹tevilo razlièic, ki jih zmore APT."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "Uau, presegli ste ¹tevilo razlièic, ki jih zmore APT."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr "Uau, presegli ste ¹tevilo odvisnosti, ki jih zmore APT."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Pri¹lo je do napake pri obdelavi %s  (Najdi paket)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Pri¹lo je do napake pri obdelavi %s (Zberi dobavitelje datotek)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "Paketa %s %s ni bilo mogoèe najti med obdelavo odvisnosti"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Ni mogoèe doloèiti seznama izvornih paketov %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Zbiranje dobaviteljev datotek"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "Napaka IO pri shranjevanju predpomnilnika virov"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "preimenovanje spodletelo, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "Neujemanje vsote MD5"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
  msgid "There are no public key available for the following key IDs:\n"
  msgstr ""
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2576,7 -2565,7 +2636,7 @@@ msgstr "
  "Ni bilo mogoèe najti datoteke za paket %s. Morda boste morali roèno "
  "popraviti ta paket (zaradi manjkajoèega arhiva)."
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2585,7 -2574,7 +2645,7 @@@ msgstr "
  "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:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
@@@ -2593,7 -2582,7 +2653,7 @@@ msgstr "
  "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket "
  "%s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Neujemanje velikosti"
  
@@@ -2602,7 -2591,7 +2662,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Ponudnikov blok %s ne vsebuje podpisa"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2611,47 -2600,47 +2671,49 @@@ msgstr "
  "Uporabljam CD-ROM priklopno toèko %s\n"
  "Priklapljam CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Identificiram.."
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Shranjena oznaka: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Uporabljam CD-ROM priklopno toèko %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Odklapljam CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Èakam na medij...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Priklapljam CD-ROM...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Preverjam medij za datoteke s kazalom..\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "Na¹el sem %i kazal paketov, %i kazal izvornih paketov in %i podpisov\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "To ni veljavno ime, poskusite ¹e enkrat.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2660,38 -2649,38 +2722,38 @@@ msgstr "
  "Ta medij se imenuje: \n"
  "'%s'\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Kopiranje seznama paketov..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Pi¹em nov seznam virov\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Izvorni vnosi za ta medij so:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Odklapljam CD-ROM..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Zapisal %i zapisov.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Zapisal %i zapisov z %i manjkajoèimi datotekami.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Zapisal %i zapisov z %i neujemajoèimi datotekami.\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2748,17 -2737,31 +2810,22 @@@ msgstr "Odpiranje nastavitvene datotek
  msgid "Completely removed %s"
  msgstr "Odstranitev %s ni uspela"
  
++#: methods/rred.cc:219
++#, fuzzy
++msgid "Could not patch file"
++msgstr "Ne morem odpreti datoteke %s"
++
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Povezava se je prezgodaj zaprla"
  
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
++#: apt-pkg/acquire-item.cc:1097
++msgid "There is no public key available for the following key IDs:\n"
+ msgstr ""
+ 
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr " %s nima prekrivnega vnosa\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr " %s nima prekrivnega vnosa\n"
 -
 -#: methods/rred.cc:219
 -#, fuzzy
 -msgid "Could not patch file"
 -msgstr "Ne morem odpreti datoteke %s"
 +#~ msgid "File date has changed %s"
 +#~ msgstr "Datum datoteke se je spremenil %s"
  
- #, fuzzy
- #~ msgid "Could not patch file"
- #~ msgstr "Ne morem odpreti datoteke %s"
- 
  #~ msgid "Reading file list"
  #~ msgstr "Branje seznama datotek"
  
diff --combined po/sv.po
index c9ef9d8b1,ead0b7011..1e020ad36
--- a/po/sv.po
+++ b/po/sv.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-05-27 13:46+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2006-08-18 15:45+0100\n"
  "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
  "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@@ -15,146 -15,146 +15,156 @@@
  "Content-Type: text/plain; charset=iso-8859-1\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Paket %s version %s har ett beroende som inte kan tillfredsställas:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Kunde inte lokalisera paket %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Totalt antal paketnamn: "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Normala paket: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Rent virtuella paket: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Enkelt virtuella paket: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Blandat virtuella paket: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Saknade: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Totalt antal olika versioner: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Totalt antal olika versioner: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Totalt antal beroenden: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Totalt antal version/filrelationer: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Totalt antal version/filrelationer: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Totalt antal tillhandahållningsmarkeringar: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Totalt antal sökmönstersträngar: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Totalt utrymme för versionsberoenden: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Totalt bortkastat utrymme: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Totalt utrymme som kan redogöras för: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Paketfilen %s är inte synkroniserad."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Du måste ange exakt ett mönster"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Inga paket hittades"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "\"Package\"-filer:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "Cachen är ur synk, kan inte korsreferera en paketfil"
  
  # Prioritet följt av URI
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Fastnålade paket:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(ej funnen)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Installerad: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(ingen)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Kandidat: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Paketnålning: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Versionstabell:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s för %s %s kompilerad den %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -301,7 -301,7 +311,7 @@@ msgstr "
  "  -c=? Läs denna inställningsfil.\n"
  "  -o=? Ange valfri inställningsflagga. T.ex -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Kunde inte skriva till %s"
@@@ -424,131 -424,113 +434,131 @@@ msgstr "Inga val träffades
  msgid "Some files are missing in the package file group `%s'"
  msgstr "Några filer saknas i paketfilsgruppen \"%s\""
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "DB var skadad, filen omdöpt till %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "DB är för gammal, försöker uppgradera %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +"DB-formatet är ogiltigt. Ta bort och återskapa databasen om du uppgraderar "
 +"från en äldre version av apt."
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "Kunde inte öppna DB-filen %s: %s"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
 +#, c-format
 +msgid "Failed to stat %s"
 +msgstr "Misslyckades med att ta status på %s"
 +
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "Arkivet har ingen styrpost"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "Kunde inte få tag i någon markör"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "V: Kunde inte läsa katalogen %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "V: Kunde inte ta status på %s\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "F: "
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "V: "
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "F: Felen gäller filen "
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "Misslyckades med att slå upp %s"
  
  # ???
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "Trädvandring misslyckades"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "Misslyckades med att öppna %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr " Avlänka %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "Misslyckades med att läsa länk %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "Misslyckades med att länka ut %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** Misslyckades med att länka %s till %s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " Avlänkningsgräns på %sB nådd.\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "Misslyckades med att ta status på %s"
 -
  # Fält vid namn "Package"
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "Arkivet har inget package-fält"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr "  %s har ingen post i override-filen\n"
  
  # parametrar: paket, ny, gammal
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "  ansvarig för %s är %s ej %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr "  %s har ingen källåsidosättningspost\n"
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr "  %s har heller ingen binär åsidosättningspost\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -646,79 -628,79 +656,79 @@@ msgstr "Problem med att länka ut %s
  msgid "Failed to rename %s to %s"
  msgstr "Misslyckades med att byta namn på %s till %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "J"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Fel vid tolkning av reguljärt uttryck - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "men %s är installerat"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "men %s kommer att installeras"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "men det kan inte installeras"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "men det är ett virtuellt paket"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "men det är inte installerat"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "men det kommer inte att installeras"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " eller"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Följande NYA paket kommer att installeras:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Följande paket kommer att TAS BORT:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Följande paket har hållits tillbaka:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Följande paket kommer att uppgraderas:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Följande paket kommer att NEDGRADERAS:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Följande hållna paket kommer att ändras:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (på grund av %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -726,146 -708,146 +736,146 @@@ msgstr "
  "VARNING: Följande systemkritiska paket kommer att tas bort\n"
  "Detta bör INTE göras såvida du inte vet exakt vad du gör!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu uppgraderade, %lu nyinstallerade, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu ominstallerade, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu nedgraderade, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu att ta bort och %lu ej uppgraderade.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu ej helt installerade eller borttagna.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Rättar till beroenden...."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " misslyckades."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Kunde inte rätta till beroenden"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Kunde inte minimera uppgraderingsuppsättningen"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Färdig"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr ""
  "Du kan möjligen rätta till dessa genom att köra \"apt-get -f install\"."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "Otillfredsställda beroenden. Försök med -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "VARNING: Följande paket kunde inte autentiseras!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "Autentiseringsvarning åsidosatt.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Installera dessa paket utan verifiering [j/N]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Några av paketen kunde inte autentiseras"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Problem har uppstått och -y användes utan --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "Internt fel. InstallPackages kallades upp med brutna paket!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Paket måste tas bort men \"Remove\" är inaktiverat."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Internt fel. Sorteringen färdigställdes inte"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Kunde inte låsa hämtningskatalogen."
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Listan över källor kunde inte läsas."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  "Konstigt.. storlekarna stämde inte överens, skicka e-post till apt@packages."
  "debian.org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Behöver hämta %sB/%sB arkiv.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Behöver hämta %sB arkiv.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "Efter uppackning kommer %sB ytterligare diskutrymme att användas.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Efter uppackning kommer %sB frigöras på disken.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Kunde inte läsa av ledigt utrymme i %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Du har inte tillräckligt ledigt utrymme i %s"
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Ja, gör som jag säger!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -877,28 -859,28 +887,28 @@@ msgstr "
  " ?] "
  
  # Visas då man svarar nej
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Avbryter."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Vill du fortsätta [J/n]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Misslyckades med att hämta %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Misslyckades med att hämta vissa filer"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Hämtningen färdig i \"endast-hämta\"-läge"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -906,48 -888,48 +916,48 @@@ msgstr "
  "Vissa arkiv kunte inte hämtas. Pröva eventuellt \"apt-get update\" eller med "
  "--fix-missing."
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing och mediabyte stöds inte ännu"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Kunde inte rätta till saknade paket."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Avbryter installationen."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Observera, väljer %s istället för %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  "Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Paketet %s är inte installerat, så tas inte bort\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Paketet %s är ett virtuellt paket som tillhandahålls av:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Installerat]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Du bör explicit ange ett att installera."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -958,49 -940,49 +968,49 @@@ msgstr "
  "Detta betyder vanligen att paketet saknas, har blivit föråldrat eller\n"
  "bara är tillgängligt från andra källor\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Dock kan följande paket ersätta det:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Paketet %s har ingen installationskandidat"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s är redan den senaste versionen.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Utgåvan \"%s\" för \"%s\" hittades inte"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Version \"%s\" för \"%s\" hittades inte"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Vald version %s (%s) för %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "Uppdateringskommandot tar inga argument"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Kunde inte låsa listkatalogen"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1008,26 -990,26 +1018,45 @@@ msgstr "
  "Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla "
  "använts istället."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "Följande information kan vara till hjälp för att lösa situationen:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Internt fel, problemlösaren bröt sönder saker"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Internt fel, AllUpgrade förstörde något"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Kunde inte hitta paketet %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Observera, väljer %s för regex \"%s\"\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr ""
  "Du kan möjligen rätta till detta genom att köra \"apt-get -f install\":"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1035,7 -1017,7 +1064,7 @@@ msgstr "
  "Otillfredsställda beroenden. Försök med \"apt-get -f install\" utan paket "
  "(eller ange en lösning)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1047,7 -1029,7 +1076,7 @@@ msgstr "
  "distributionen, att några krävda paket ännu inte har skapats eller\n"
  "lagts in från \"Incoming\"."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1057,119 -1039,119 +1086,115 @@@ msgstr "
  "helt enkelt inte kan installeras och att en felrapport om detta bör\n"
  "skrivas."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "Följande information kan vara till hjälp för att lösa situationen:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Trasiga paket"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Följande ytterligare paket kommer att installeras:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Föreslagna paket:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Rekommenderade paket:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Beräknar uppgradering... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Misslyckades"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Färdig"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Internt fel, problemlösaren bröt sönder saker"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "Du måste ange åtminstone ett paket att hämta källkod för"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Kunde inte hitta något källkodspaket för %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Hoppar över redan hämtad fil \"%s\"\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Du har inte tillräckligt ledigt utrymme i %s"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Behöver hämta %sB källkodsarkiv.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Hämtar källkod %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Misslyckades med att hämta vissa arkiv."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Packar inte upp redan redan uppackad källkod i %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Kontrollera att paketet \"dpkg-dev\" är installerat.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Byggkommandot \"%s\" misslyckades.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Barnprocessen misslyckades"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr "Du måste ange åtminstone ett paket att inhämta byggberoenden för"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Kunde inte hämta byggberoendeinformation för %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s har inga byggberoenden.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1177,7 -1159,7 +1202,7 @@@
  msgstr ""
  "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte hittas"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1186,32 -1168,32 +1211,32 @@@ msgstr "
  "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga "
  "versioner av paketet %s uppfyller versionskraven"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Misslyckades med att uppfylla %s-beroendet för %s: Det installerade paketet %"
  "s är för nytt"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Misslyckades med att uppfylla %s-beroendet för %s: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Byggberoenden för %s kunde inte uppfyllas."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Kunde inte hantera byggberoenden"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Moduler som stöds:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1397,19 -1379,19 +1422,19 @@@ msgstr "Lägger in tillgänglighetsinform
  msgid "Failed to create pipes"
  msgstr "Misslyckades med att skapa rör"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "Misslyckades med att köra gzip"
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "Fördärvat arkiv"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Tar-kontrollsumma misslyckades, arkiv trasigt"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "Okänd TAR-huvudtyp %u, del %s"
@@@ -1556,9 -1538,9 +1581,9 @@@ msgid "The info and temp directories ne
  msgstr "Katalogerna info och temp måste ligga på samma filsystem"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Läser paketlistor"
  
@@@ -1692,12 -1674,12 +1717,14 @@@ msgstr "Disk ej funnen.
  msgid "File not found"
  msgstr "Filen ej funnen"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Kunde inte ta status"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Misslyckades sätta modifieringstid"
  
@@@ -1825,7 -1807,7 +1852,7 @@@ msgstr "Anslutet datauttag (socket) fic
  msgid "Unable to accept connection"
  msgstr "Kunde inte ta emot anslutning"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Problem med att lägga filen till hashtabellen"
  
@@@ -1913,40 -1895,40 +1940,40 @@@ msgstr "Något otäckt hände när \"%s:%s\
  msgid "Unable to connect to %s %s:"
  msgstr "Kunde inte ansluta till %s %s:"
  
 -#: methods/gpgv.cc:64
 +#: methods/gpgv.cc:65
  #, c-format
  msgid "Couldn't access keyring: '%s'"
  msgstr "Kunde inte komma åt nyckelring: \"%s\""
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr "E: Argumentslistan från Acquire::gpgv::Options för lång. Avslutar."
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr ""
  "Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!"
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr "Åtminstone en giltig signatur träffades på."
  
 -#: methods/gpgv.cc:207
 +#: methods/gpgv.cc:213
  #, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
  msgstr ""
  "Kunde inte starta \"%s\" för att verifiera signatur (är gnupg installerad?)"
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr "Okänt fel vid exekvering av gpgv"
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
  msgstr "Följande signaturer är ogiltiga:\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
@@@ -1954,87 -1936,87 +1981,87 @@@ msgstr "
  "Följande signaturer kunde inte verifieras för att den publika nyckeln inte "
  "är tillgänglig:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Kunde inte öppna rör för %s"
  
  # %s = programnamn
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Läsfel på %s-processen"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Väntar på huvuden"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Fick en ensam huvudrad på %u tecken"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Trasig huvudrad"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "Http-servern sände ett ogiltigt svarshuvud"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  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:599
  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:601
  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:625
  msgid "Unknown date format"
  msgstr "Okänt datumformat"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "\"Select\" misslyckades"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Tidsgränsen för anslutningen nåddes"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Fel vid skrivning till utdatafil"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Fel vid skrivning till fil"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Fel vid skrivning till filen"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Fel vid läsning från server"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Trasigt data i huvud"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Anslutning misslyckades"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Internt fel"
  
@@@ -2047,7 -2029,7 +2074,7 @@@ msgstr "Kan inte utföra mmap på en tom 
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Kunde inte utföra mmap på %lu byte"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Valet %s ej funnet"
@@@ -2107,12 -2089,12 +2134,12 @@@ msgstr "Syntaxfel %s:%u: Direktivet \"%
  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:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Fel!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Färdig"
@@@ -2246,95 -2228,95 +2273,112 @@@ msgid "Problem syncing the file
  msgstr "Problem med att synka filen"
  
  # Felmeddelande
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Paketcachen är tom"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Paketcachefilen är trasig"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Paketcachefilens version är inkompatibel"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Denna APT stöder inte versionssystemet \"%s\""
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "Paketcachen byggdes för en annan arkitektur"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Beror"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Beror i förväg"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Föreslår"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Rekommenderar"
  
  # "Konfliktar"?
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "I konflikt med"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Ersätter"
  
  # "Föråldrar"?
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Gör föråldrad"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "viktigt"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "krävt"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "normalt"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "valfri"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Bygger beroendeträd"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Kandiderande versioner"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Beroendegenerering"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Lägger in tillgänglighetsinformation"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Misslyckades med att öppna %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Misslyckades med att skriva filen %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Kunde inte tolka paketfilen %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Kunde inte tolka paketfilen %s (2)"
@@@ -2369,7 -2351,7 +2413,7 @@@ msgstr "Rad %lu i källistan %s har fel 
  msgid "Opening %s"
  msgstr "Öppnar %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Rad %u för lång i källistan %s."
@@@ -2406,14 -2388,14 +2450,14 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Indexfiler av typ \"%s\" stöds inte"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr ""
  "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:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2421,7 -2403,7 +2465,7 @@@ msgstr "
  "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på "
  "hållna paket."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr "Kunde inte korrigera problemen, du har hållt trasiga paket."
  
@@@ -2462,13 -2444,13 +2506,13 @@@ msgstr "Metoden %s startade inte korrek
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr "Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck Enter."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Paketsystemet \"%s\" stöds inte"
  
  #
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Kunde inte avgöra en lämpligt paketsystemstyp"
  
@@@ -2503,102 -2485,101 +2547,118 @@@ msgstr "Förstod inte nåltypen %s
  msgid "No priority (or zero) specified for pin"
  msgstr "Prioritet ej angiven (eller noll) för nål"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Cachen har ett inkompatibelt versionssystem"
  
  # NewPackage etc. är funktionsnamn
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Fel uppstod vid hantering av %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Fel uppstod vid hantering av %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Fel uppstod vid hantering av %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Fel uppstod vid hantering av %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Fel uppstod vid hantering av %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Fel uppstod vid hantering av %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Fel uppstod vid hantering av %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Fel uppstod vid hantering av %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Fel uppstod vid hantering av %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr "Grattis, du överskred antalet paketnamn denna APT kan hantera."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "Grattis, du överskred antalet versioner denna APT kan hantera."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "Grattis, du överskred antalet versioner denna APT kan hantera."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr "Grattis, du överskred antalet beroenden denna APT kan hantera."
  
  # NewPackage etc. är funktionsnamn
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Fel uppstod vid hantering av %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "Fel uppstod vid hantering av %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "Paketet %s %s hittades inte när filberoenden hanterades"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Kunde inte ta status på källkodspaketlistan %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Samlar filberoenden"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "In-/utfel vid lagring av källcache"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "namnbyte misslyckades, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "MD5-kontrollsumma stämmer inte"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr "Det finns ingen publik nyckel tillgänglig för följande nyckel-id:n:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2607,7 -2588,7 +2667,7 @@@ msgstr "
  "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:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2616,13 -2597,13 +2676,13 @@@ msgstr "
  "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:1305
  #, 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:1392
  msgid "Size mismatch"
  msgstr "Storleken stämmer inte"
  
@@@ -2631,7 -2612,7 +2691,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Leverantörsblock %s saknar fingeravtryck"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2640,47 -2621,47 +2700,49 @@@ msgstr "
  "Använder cd-rom-monteringspunkt %s\n"
  "Monterar cd-rom\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Identifierar.. "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Etikett: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Använder cd-rom-monteringspunkt %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Avmonterar cd-rom\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Väntar på skiva...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Monterar cd-rom...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Söker efter indexfiler på disken...\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "Hittade %i paketindex, %i källkodsindex och %i signaturer\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Namnet är ogiltigt, försök igen.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2689,38 -2670,38 +2751,38 @@@ msgstr "
  "Denna skiva heter: \n"
  "\"%s\"\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Kopierar paketlistor..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Skriver ny källista\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Poster i källistan för denna skiva:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Avmonterar cd-rom..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Skrev %i poster.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Skrev %i poster med %i saknade filer.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Skrev %i poster med %i filer som inte stämmer\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n"
@@@ -2775,17 -2756,30 +2837,23 @@@ msgstr "Förbereder att ta bort hela %s
  msgid "Completely removed %s"
  msgstr "Tog bort hela %s"
  
++#: methods/rred.cc:219
++msgid "Could not patch file"
++msgstr "Kunde inte lägga på programfix på filen"
++
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Förbindelsen stängdes i förtid"
  
++#: apt-pkg/acquire-item.cc:1097
++#, fuzzy
++msgid "There is no public key available for the following key IDs:\n"
++msgstr "Det finns ingen publik nyckel tillgänglig för följande nyckel-id:n:\n"
++
  # Felmeddelande för misslyckad chdir
  #~ msgid "File date has changed %s"
  #~ msgstr "Fildatumet har ändrats %s"
  
 -#~ msgid ""
 -#~ "DB format is invalid. If you upgraded from a older version of apt, please "
 -#~ "remove and re-create the database."
 -#~ msgstr ""
 -#~ "DB-formatet är ogiltigt. Ta bort och återskapa databasen om du "
 -#~ "uppgraderar från en äldre version av apt."
 -
 -#~ msgid "  %s has no source override entry\n"
 -#~ msgstr "  %s har ingen källåsidosättningspost\n"
 -
 -#~ msgid "  %s has no binary override entry either\n"
 -#~ msgstr "  %s har heller ingen binär åsidosättningspost\n"
 -
--#~ msgid "Could not patch file"
--#~ msgstr "Kunde inte lägga på programfix på filen"
--
  #~ msgid "Reading file list"
  #~ msgstr "Läser fillista"
  
diff --combined po/tl.po
index 9f77a912d,679ae8d62..a2a697962
--- a/po/tl.po
+++ b/po/tl.po
@@@ -10,7 -10,7 +10,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-08-09 16:17+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2006-03-16 15:53+0800\n"
  "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
  "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@@ -19,145 -19,145 +19,155 @@@
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=2; plural=n>1;\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Paketeng %s bersyon %s ay may kulang na dep:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Hindi mahanap ang paketeng %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Kabuuan ng mga Pakete : "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Normal na Pakete: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Purong Birtwual na Pakete: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Nag-iisang Birtwal na Pakete: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Halong Birtwal na Pakete: "
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Kulang/Nawawala: "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Kabuuan ng Natatanging mga Bersyon: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Kabuuan ng Natatanging mga Bersyon: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Kabuuan ng mga Dependensiya: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Kabuuan ng ugnayang Ber/Talaksan: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Kabuuan ng ugnayang Ber/Talaksan: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Kabuuan ng Mapping ng Provides: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Kabuuan ng Globbed String: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Kabuuan ng gamit na puwang ng Dependensiyang Bersyon: "
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Kabuuan ng Hindi Nagamit na puwang: "
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Kabuuan ng puwang na napag-tuosan: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Wala sa sync ang talaksan ng paketeng %s."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Kailangan niyong magbigay ng isa lamang na pattern"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Walang nahanap na mga pakete"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Talaksang Pakete:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "Wala sa sync ang cache, hindi ma-x-ref ang talaksang pakete"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Mga naka-Pin na Pakete:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(hindi nahanap)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Nakaluklok: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(wala)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Kandidato: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Naka-Pin na Pakete: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Talaang Bersyon:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2380 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s para sa %s %s kinompile noong %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -307,7 -307,7 +317,7 @@@ msgstr "
  "  -c=? Basahin ang talaksang pagkaayos na ito\n"
  "  -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Hindi makapagsulat sa %s"
@@@ -649,79 -649,79 +659,79 @@@ msgstr "Problema sa pag-unlink ng %s
  msgid "Failed to rename %s to %s"
  msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "O"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Error sa pag-compile ng regex - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "ngunit ang %s ay nakaluklok"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "ngunit ang %s ay iluluklok"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "ngunit hindi ito maaaring iluklok"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "ngunit ito ay birtwal na pakete"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "ngunit ito ay hindi nakaluklok"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "ngunit ito ay hindi iluluklok"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " o"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Ang susunod na mga pakete ay iu-upgrade:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (dahil sa %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -729,150 -729,150 +739,150 @@@ msgstr "
  "BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n"
  "HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu iniluklok muli, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu nai-downgrade, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Inaayos ang mga dependensiya..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " ay bigo."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Hindi maayos ang mga dependensiya"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Hindi mai-minimize ang upgrade set"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Tapos"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "Maaari ninyong patakbuhin ang `apt-get -f install' upang ayusin ito."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr ""
  "BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr ""
  "Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Iluklok ang mga paketeng ito na walang beripikasyon [o/H]? "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "May mga problema at -y ay ginamit na walang --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr ""
  "Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr ""
  "May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Hindi maaldaba ang directory ng download"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2128
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  "Nakapagtataka.. Hindi magkatugma ang laki, mag-email sa apt@packages.debian."
  "org"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Kailangang kumuha ng %sB ng arkibo.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr ""
  "Matapos magbuklat ay %sB na karagdagang puwang sa disk ang magagamit.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Hindi matantsa ang libreng puwang sa %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Kulang kayo ng libreng puwang sa %s."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Oo, gawin ang sinasabi ko!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -883,28 -883,28 +893,28 @@@ msgstr "
  "Upang magpatuloy, ibigay ang pariralang '%s'\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Abort."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Nais niyo bang magpatuloy [O/h]? "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2025
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Bigo sa pagkuha ng %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "May mga talaksang hindi nakuha"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2034
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -912,48 -912,48 +922,48 @@@ msgstr "
  "Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o "
  "subukang may --fix-missing?"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Hindi maayos ang mga kulang na pakete."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Ina-abort ang pag-instol."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Paunawa, pinili ang %s imbes na %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  "Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Ang paketeng %s ay paketeng birtwal na bigay ng:\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Nakaluklok]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Dapat kayong mamili ng isa na iluluklok."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -964,49 -964,49 +974,49 @@@ msgstr "
  "Maaaring nawawala ang pakete, ito'y laos na, o ito'y makukuha lamang\n"
  "sa ibang pinagmulan.\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Gayunpaman, ang sumusunod na mga pakete ay humahalili sa kanya:"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s ay pinakabagong bersyon na.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Release '%s' para sa '%s' ay hindi nahanap"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Hindi maaldaba ang directory ng talaan"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1014,26 -1014,26 +1024,46 @@@ msgstr "
  "May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang "
  "mga luma na lamang."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr ""
++"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Error na internal, may nasira ang problem resolver"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Hindi mahanap ang paketeng %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr ""
  "Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1041,7 -1041,7 +1071,7 @@@ msgstr "
  "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
  "mga pakete (o magtakda ng solusyon)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1052,7 -1052,7 +1082,7 @@@ msgstr "
  "o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n"
  "kailangan na hindi pa nalikha o linipat mula sa Incoming."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1062,120 -1062,120 +1092,115 @@@ msgstr "
  "hindi talaga mailuklok at kailangang magpadala ng bug report tungkol sa\n"
  "pakete na ito."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr ""
--"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Sirang mga pakete"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1685
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Mga paketeng mungkahi:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1686
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Mga paketeng rekomendado:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1706
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Sinusuri ang pag-upgrade... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Bigo"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1714
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Tapos"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Error na internal, may nasira ang problem resolver"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1887
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1917 cmdline/apt-get.cc:2146
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Hindi mahanap ang paketeng source para sa %s"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1961
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1985
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Kulang kayo ng libreng puwang sa %s"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1990
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1993
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1999
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Kunin ang Source %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2030
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Bigo sa pagkuha ng ilang mga arkibo."
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2058
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2070
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2071
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2088
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Utos na build '%s' ay bigo.\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2107
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Bigo ang prosesong anak"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2123
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2151
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Hindi makuha ang impormasyong build-dependency para sa %s"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2171
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "Walang build depends ang %s.\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2223
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@@ -1184,7 -1184,7 +1209,7 @@@ msgstr "
  "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
  "mahanap"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2275
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1193,32 -1193,32 +1218,32 @@@ msgstr "
  "Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon "
  "ng paketeng %s na tumutugon sa kinakailangang bersyon"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2310
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %"
  "s ay bagong-bago pa lamang."
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2335
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2349
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Hindi mabuo ang build-dependencies para sa %s."
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2353
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Bigo sa pagproseso ng build dependencies"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2385
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Suportadong mga Module:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2426
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1558,9 -1558,9 +1583,9 @@@ msgid "The info and temp directories ne
  msgstr "Ang info at temp directory ay kailangang nasa parehong filesystem"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Binabasa ang Listahan ng mga Pakete"
  
@@@ -1694,12 -1694,12 +1719,14 @@@ msgstr "Hindi nahanap ang Disk.
  msgid "File not found"
  msgstr "Hindi Nahanap ang Talaksan"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
+ #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Bigo ang pag-stat"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
+ #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Bigo ang pagtakda ng oras ng pagbago"
  
@@@ -1827,7 -1827,7 +1854,7 @@@ msgstr "Nag-timeout ang socket ng datos
  msgid "Unable to accept connection"
  msgstr "Hindi makatanggap ng koneksyon"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Problema sa pag-hash ng talaksan"
  
@@@ -1954,86 -1954,86 +1981,86 @@@ msgstr "
  "Ang sumusunod na mga lagda ay hindi maberipika dahil ang public key ay hindi "
  "available:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Hindi makapag-bukas ng pipe para sa %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Error sa pagbasa mula sa prosesong %s"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Naghihintay ng panimula"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Maling linyang panimula"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "Nagpadala ang HTTP server ng di tanggap na reply header"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "Sira ang range support ng HTTP server na ito"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Di kilalang anyo ng petsa"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Bigo ang pagpili"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Nag-timeout ang koneksyon"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Error sa pagsulat ng talaksang output"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Error sa pagsulat sa talaksan"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Error sa pagsusulat sa talaksan"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Error sa pagbasa mula sa server"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Maling datos sa panimula"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Bigo ang koneksyon"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Internal na error"
  
@@@ -2046,7 -2046,7 +2073,7 @@@ msgstr "Hindi mai-mmap ang talaksang wa
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Hindi makagawa ng mmap ng %lu na byte"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Piniling %s ay hindi nahanap"
@@@ -2107,12 -2107,12 +2134,12 @@@ msgstr "Syntax error %s:%u: Di suportad
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Syntax error %s:%u: May basura sa dulo ng talaksan"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Error!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Tapos"
@@@ -2249,93 -2249,93 +2276,110 @@@ msgstr "Problema sa pag-unlink ng talak
  msgid "Problem syncing the file"
  msgstr "Problema sa pag-sync ng talaksan"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Walang laman ang cache ng pakete"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Sira ang talaksan ng cache ng pakete"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Ang talaksan ng cache ng pakete ay hindi magamit na bersyon"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Ang APT na ito ay hindi nagsusuporta ng versioning system '%s'"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "Ang cache ng pakete ay binuo para sa ibang arkitektura"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Dependensiya"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "PreDepends"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Mungkahi"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Rekomendado"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Tunggali"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Pumapalit"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Linalaos"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "importante"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "kailangan"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "standard"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "optional"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Ginagawa ang puno ng mga dependensiya"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Bersyong Kandidato"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Pagbuo ng Dependensiya"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Pinagsasama ang magagamit na impormasyon"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Bigo ang pagbukas ng %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Bigo sa pagsulat ng talaksang %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:186
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Hindi ma-parse ang talaksang pakete %s (2)"
@@@ -2370,7 -2370,7 +2414,7 @@@ msgstr "Maling anyo ng linyang %lu sa t
  msgid "Opening %s"
  msgstr "Binubuksan %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s."
@@@ -2407,7 -2407,7 +2451,7 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
@@@ -2415,7 -2415,7 +2459,7 @@@ msgstr "
  "Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo "
  "para dito."
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2423,7 -2423,7 +2467,7 @@@ msgstr "
  "Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot "
  "ito ng mga paketeng naka-hold."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold."
@@@ -2466,12 -2466,12 +2510,12 @@@ msgid "Please insert the disc labeled: 
  msgstr ""
  "Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Hindi suportado ang sistema ng paketeng '%s'"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete "
  
@@@ -2508,102 -2508,101 +2552,118 @@@ msgstr "Hindi naintindihan ang uri ng p
  msgid "No priority (or zero) specified for pin"
  msgstr "Walang prioridad (o sero) na nakatakda para sa pin"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Hindi akma ang versioning system ng cache"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "May naganap na error habang prinoseso ang %s (NewPackage)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "May naganap na error habang prinoseso ang %s (UsePackage1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "May naganap na error habang prinoseso ang %s (UsePackage2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "May naganap na error habang prinoseso ang %s (NewVersion1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "May naganap na error habang prinoseso ang %s (UsePackage3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "May naganap na error habang prinoseso ang %s (NewVersion2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  "Wow, nalagpasan niyo ang bilang ng pangalan ng pakete na kaya ng APT na ito."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr "Wow, nalagpasan niyo ang bilang ng dependensiya na kaya ng APT na ito."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "May naganap na error habang prinoseso ang %s (FindPkg)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "May naganap na Error habang prinoseso ang %s (CollectFileProvides)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  "Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya."
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Kinukuha ang Talaksang Provides"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "IO Error sa pag-imbak ng source cache"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "Di tugmang MD5Sum"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr "Walang public key na magagamit para sa sumusunod na key ID:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2612,7 -2611,7 +2672,7 @@@ msgstr "
  "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
  "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)"
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2621,7 -2620,7 +2681,7 @@@ msgstr "
  "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
  "niyong ayusin ng de kamay ang paketeng ito."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
@@@ -2629,7 -2628,7 +2689,7 @@@ msgstr "
  "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
  "paketeng %s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Di tugmang laki"
  
@@@ -2638,7 -2637,7 +2698,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Block ng nagbebenta %s ay walang fingerprint"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2647,49 -2646,49 +2707,51 @@@ msgstr "
  "Ginagamit ang %s bilang mount point ng CD-ROM\n"
  "Sinasalang ang CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Kinikilala..."
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Naka-imbak na Label: %s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Ginagamit ang %s bilang mount point ng CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Ina-unmount ang CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Hinihintay ang disc...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Sinasalang ang CD-ROM...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Sinisiyasat ang Disc para sa talaksang index...\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr ""
  "Nakahanap ng %i na index ng mga pakete, %i na index ng source at %i na "
  "signature\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Hindi yan tanggap na pangalan, subukan muli.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2698,38 -2697,38 +2760,38 @@@ msgstr "
  "Ang Disc na ito ay nagngangalang: \n"
  "'%s'\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Kinokopya ang Listahan ng mga Pakete"
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Sinusulat ang bagong listahan ng pagkukunan\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Ina-unmount ang CD-ROM..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Nagsulat ng %i na record.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2786,17 -2785,17 +2848,23 @@@ msgstr "Hinahanda ang %s upang isaayos
  msgid "Completely removed %s"
  msgstr "Bigo sa pagtanggal ng %s"
  
++#: methods/rred.cc:219
++#, fuzzy
++msgid "Could not patch file"
++msgstr "Hindi mabuksan ang talaksang %s"
++
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Nagsara ng maaga ang koneksyon"
  
++#: apt-pkg/acquire-item.cc:1097
++#, fuzzy
++msgid "There is no public key available for the following key IDs:\n"
++msgstr "Walang public key na magagamit para sa sumusunod na key ID:\n"
++
  #~ msgid "File date has changed %s"
  #~ msgstr "Nagbago ang petsa ng talaksang %s"
  
--#, fuzzy
--#~ msgid "Could not patch file"
--#~ msgstr "Hindi mabuksan ang talaksang %s"
--
  #~ msgid "Reading file list"
  #~ msgstr "Binabasa ang Talaksang Listahan"
  
diff --combined po/vi.po
index db77f54a3,aa288351e..9672d7e19
--- a/po/vi.po
+++ b/po/vi.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-09-12 11:18+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2006-09-21 17:16+0930\n"
  "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
  "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@@ -16,148 -16,148 +16,158 @@@
  "Plural-Forms: nplurals=1; plural=0;\n"
  "X-Generator: LocFactoryEditor 1.6fc1\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Gói %s phiên bản %s phụ thuộc vào phần mềm chưa có :\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "Không thể định vị gói %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "Tổng số tên gói: "
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  Gói chuẩn: "
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  Gói ảo nguyên chất: "
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  Gói ảo đơn: "
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  Gói ảo hỗn hợp:"
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  Thiếu : "
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "Tổng số phiên bản riêng: "
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "Tổng số phiên bản riêng: "
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "Tổng số phụ thuộc: "
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "Tổng số liên quan phiên bản và tập tin: "
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "Tổng số liên quan phiên bản và tập tin: "
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "Tổng số ảnh xạ Miễn là: "
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Tổng số chuỗi mở rộng mẫu tìm kiếm: "
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "Tổng chỗ phiên bản phụ thuộc:"
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Tổng chỗ nghỉ:"
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "Tổng chỗ đã tính: "
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Tập tin gói %s không đồng bộ được."
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "Bạn phải đưa ra đúng một mẫu"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "Không tìm thấy gói"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "Tập tin gói:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr ""
  "Bộ nhớ tạm không đồng bộ được nên không thể tham chiếu chéo tập tin gói"
  
  # Variable: do not translate/ biến: đừng dịch
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "Các gói đã ghim:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(không tìm thấy)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  Đã cài đặt: "
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(không có)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  Ứng cử: "
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  Ghim gói: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  Bảng phiên bản:"
  
  # Variable: do not translate/ biến: đừng dịch
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
--#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s cho %s %s được biên dịch vào %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -317,7 -317,7 +327,7 @@@ msgstr "
  "  -c=? \t\tĐọc tập tin cấu hình này\n"
  "  -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Không thể ghi vào %s"
@@@ -672,79 -672,79 +682,79 @@@ msgstr "Gặp lỗi khi bỏ liên kế
  msgid "Failed to rename %s to %s"
  msgstr "Việc đổi tên %s thành %s bị lỗi"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "C"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Lỗi biên dich biểu thức chính quy - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "Những gói theo đây phụ thuộc vào phần mềm chưa có :"
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "nhưng mà %s đã được cài đặt"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "nhưng mà %s sẽ được cài đặt"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "nhưng mà nó không có khả năng cài đặt"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "nhưng mà nó là gói ảo"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "nhưng mà nó chưa được cài đặt"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "nhưng mà nó sẽ không được cài đặt"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " hay"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "Theo đây có những gói MỚI sẽ được cài đặt:"
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "Theo đây có những gói sẽ bị GỠ BỎ :"
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "Theo đây có những gói đã được giữ lại:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "Theo đây có những gói sẽ được nâng cấp:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "Theo đây có những gói sẽ được HẠ CẤP:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "Theo đây có những gói sẽ được thay đổi:"
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (do %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -752,147 -752,147 +762,147 @@@ msgstr "
  "CẢNH BÁO : theo đây có những gói chủ yếu sẽ bị gỡ bỏ.\n"
  "ĐỪNG làm như thế trừ khi bạn biết làm gì ở đây nó một cách chính xác."
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "%lu đã nâng cấp, %lu mới được cài đặt, "
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "%lu được cài đặt lại, "
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "%lu được hạ cấp, "
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "Đang sửa cách phụ thuộc..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " đã thất bại."
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "Không thể sửa cách phụ thuộc"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "Không thể cực tiểu hóa bộ nâng cấp"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " Đã xong"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "Có lẽ bạn hãy chay lệnh « apt-get -f install » để sửa hết."
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr ""
  "Còn có cách phụ thuộc vào phần mềm chưa có. Như thế thì bạn hãy cố dùng tùy "
  "chọn « -f »."
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "CẢNH BÁO : không thể xác thực những gói theo đây."
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "Cảnh báo xác thực bị đè.\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "Cài đặt những gói này mà không kiểm chứng không? [y/N] [c/K] "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "Một số gói không thể được xác thực"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Gập lỗi và đã dùng tùy chọn « -y » mà không có  « --force-yes »"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "Lỗi nội bộ: InstallPackages (cài đặt gói) được gọi với gói bị hỏng."
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ (Remove) đã bị tắt."
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong"
  
--#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "Không thể khóa thư mục tải về"
  
--#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Không thể đọc danh sách nguồn."
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  "Lạ... Hai kích cỡ không khớp được. Hãy gởi thư cho <apt@packages.debian.org>"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "Cần phải lấy %sB/%sB kho.\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "Cần phải lấy %sB kho.\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "Sau khi đã giải nén, sẻ chiếm %sB sức chứa đĩa thêm.\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Sau khi đã giải nén, sẽ giải phóng %sB sức chữa đĩa thêm.\n"
  
--#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Không thể quyết định chỗ rảnh trong %s"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "Bạn chưa có đủ sức chức còn rảnh trong %s."
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  "Xác đinh « Chỉ không đáng kể » (Trivial Only) nhưng mà thao tác này đáng kể."
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Có, làm đi."
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -903,28 -903,28 +913,28 @@@ msgstr "
  "Để tiếp tục thì hãy gõ cụm từ « %s »\n"
  "?]"
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "Hủy bỏ."
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] "
  
--#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Việc gói %s bị lỗi  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "Một số tập tin không tải về được"
  
--#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "Mới tải về xong và trong chế độ chỉ tải về"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -932,49 -932,49 +942,49 @@@ msgstr "
  "Không thể lấy một số kho, có lẽ hãy chạy lệnh « apt-get update » (apt lấy "
  "cập nhật) hay cố với « --fix-missing » (sửa các điều còn thiếu) không?"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr ""
  "Chưa hô trợ tùy chọn « --fix-missing » (sửa khi thiếu điều) và trao đổi "
  "phương tiện."
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "Không thể sửa những gói còn thiếu."
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "Đang hủy bỏ cài đặt."
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "Ghi chú : đang chọn %s thay vì %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chưa lập tùy chọn Nâng cấp.\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "Gói %s là gói ảo được cung cấp do :\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [Đã cài đặt]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "Bạn nên chọn một cách dứt khoát gói cần cài."
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -985,49 -985,49 +995,49 @@@ msgstr "
  "đã tham chiếu đến nó. Có lẽ có nghĩa là gói còn thiếu,\n"
  "đã trở thành cũ, hay chỉ sẵn sàng từ nguồn khác.\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "Tuy nhiên, những gói theo đây thay thế nó :"
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "Gói %s không có ứng cử cài đặt"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "Không thể cài đặt lại %s vì không thể tải về nó.\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s là phiên bản mơi nhất.\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "Không tìm thấy bản phát hành « %s » cho « %s »"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "Không tìm thấy phiên bản « %s » cho « %s »"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "Đã chọn phiên bản %s (%s) cho %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "Lệnh cập nhật không chấp nhật đối số"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "Không thể khóa thư mục danh sách"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
@@@ -1035,25 -1035,25 +1045,44 @@@ msgstr "
  "Một số tập tin chỉ mục không tải về được, đã bỏ qua chúng, hoặc điều cũ được "
  "dùng thay thế."
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Không tìm thấy gói %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1061,7 -1061,7 +1090,7 @@@ msgstr "
  "Gói còn phụ thuộc vào phần mềm chưa có. Hãy cố chạy lệnh « apt-get -f "
  "install » mà không có gói nào (hoặc ghi rõ cách quyết định)."
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1073,7 -1073,7 +1102,7 @@@ msgstr "
  "bất định, có lẽ chưa tạo một số gói cần thiết,\n"
  "hoặc chưa di chuyển chúng ra phần Incoming (Đến)."
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1083,127 -1083,127 +1112,123 @@@ msgstr "
  "gói này đơn giản không có khả năng cài đặt, thì bạn hay\n"
  "thông báo lỗi về gói này."
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "Gói bị ngắt"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "Những gói thêm theo đây sẽ được cài đặt:"
  
--#: cmdline/apt-get.cc:1692
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "Gói được đệ nghị:"
  
--#: cmdline/apt-get.cc:1693
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "Gói được khuyên:"
  
--#: cmdline/apt-get.cc:1713
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "Đang tính nâng cấp... "
  
--#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Bị lỗi"
  
--#: cmdline/apt-get.cc:1721
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "Xong"
  
--#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì"
  
--#: cmdline/apt-get.cc:1894
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó"
  
--#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Không tìm thấy gói nguồn cho %s"
  
--#: cmdline/apt-get.cc:1968
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n"
  
--#: cmdline/apt-get.cc:1992
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "Không đủ sức chứa còn rảnh trong %s"
  
--#: cmdline/apt-get.cc:1997
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "Cần phải lấy %sB/%sB kho nguồn.\n"
  
--#: cmdline/apt-get.cc:2000
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "Cần phải lấy %sB kho nguồn.\n"
  
--#: cmdline/apt-get.cc:2006
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "Lấy nguồn %s\n"
  
--#: cmdline/apt-get.cc:2037
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "Việc lấy một số kho bị lỗi."
  
--#: cmdline/apt-get.cc:2065
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n"
  
--#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "Lệnh giải nén « %s » bị lỗi.\n"
  
--#: cmdline/apt-get.cc:2078
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n"
  
--#: cmdline/apt-get.cc:2095
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "Lệnh xây dụng « %s » bị lỗi.\n"
  
--#: cmdline/apt-get.cc:2114
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "Tiến trình con bị lỗi"
  
--#: cmdline/apt-get.cc:2130
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  "Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó"
  
--#: cmdline/apt-get.cc:2158
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s"
  
--#: cmdline/apt-get.cc:2178
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s không phụ thuộc vào gì khi xây dụng.\n"
  
--#: cmdline/apt-get.cc:2230
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s"
  
--#: cmdline/apt-get.cc:2282
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1212,31 -1212,31 +1237,31 @@@ msgstr "
  "cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng "
  "của gói %s có thể thỏa điều kiện phiên bản."
  
--#: cmdline/apt-get.cc:2317
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới"
  
--#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s."
  
--#: cmdline/apt-get.cc:2356
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s."
  
--#: cmdline/apt-get.cc:2360
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi"
  
--#: cmdline/apt-get.cc:2392
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "Mô-đun đã hỗ trợ :"
  
--#: cmdline/apt-get.cc:2433
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1586,9 -1586,9 +1611,9 @@@ msgstr "
  "thống tập tin"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "Đang đọc các danh sách gói..."
  
@@@ -1722,12 -1722,12 +1747,14 @@@ msgstr "Không tìm thấy đĩa
  msgid "File not found"
  msgstr "Không tìm thấy tập tin"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:134
 -#: methods/gzip.cc:143
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "Việc lấy các thông tin bị lỗi"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:140
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "Việc lập giờ sửa đổi bị lỗi"
  
@@@ -1855,7 -1855,7 +1882,7 @@@ msgstr "Kết nối ổ cắm dữ liá»
  msgid "Unable to accept connection"
  msgstr "Không thể chấp nhận kết nối"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Gặp khó khăn băm tập tin"
  
@@@ -1978,90 -1978,90 +2005,90 @@@ msgid "
  msgstr ""
  "Không thể kiểm chứng những chữ ký theo đây, vì khóa công không sẵn sàng:\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "Không thể mở ống dẫn cho %s"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "Gặp lỗi đọc từ tiến trình %s"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "Đang đợi những phần đầu..."
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "Đã lấy một dòng đầu riêng lẻ chứa hơn %u ky tự"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "Dòng đầu sai"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "Máy phục vụ HTTP đã gởi một dòng đầu trả lời không hợp lệ"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr ""
  "Máy phục vụ HTTP đã gởi một dòng đầu Content-Length (độ dài nội dụng) không "
  "hợp lệ"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr ""
  "Máy phục vụ HTTP đã gởi một dòng đầu Content-Range (phạm vị nội dụng) không "
  "hợp lệ"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "Không biết dạng ngày"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Việc chọn bị lỗi"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "Kết nối đã quá giờ"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "Gặp lỗi khi ghi vào tập tin xuất"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "Gặp lỗi khi ghi vào tập tin"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "Gặp lỗi khi ghi vào tập tin đó"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng kết nối"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "Gặp lỗi khi đọc từ máy phục vụ"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "Dữ liệu dòng đầu sai"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "Kết nối bị ngắt"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "Gặp lỗi nội bộ"
  
@@@ -2074,7 -2074,7 +2101,7 @@@ msgstr "Không thể mmap (ảnh xạ b
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "Không tìm thấy vùng chọn %s"
@@@ -2134,12 -2134,12 +2161,12 @@@ msgstr "Gặp lỗi cú pháp %s:%u: ch
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "Gặp lỗi cú pháp %s:%u: rác thêm tại kết thúc tập tin"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... Lỗi."
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... Xong"
@@@ -2271,93 -2271,93 +2298,110 @@@ msgstr "Gặp lỗi khi bỏ liên kế
  msgid "Problem syncing the file"
  msgstr "Gặp lỗi khi đồng bộ hóa tập tin đó"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "Bộ nhớ tạm gói rỗng"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "Tập tin bộ nhớ tạm gói bị hỏng"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "Tập tin bộ nhớ tạm gói là một phiên bản không tương thích"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên bản « %s »"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "Bộ nhớ tạm gói được xây dụng cho kiến trức khác"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "Phụ thuộc"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "Phụ thuộc trước"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "Đệ nghị"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "Khuyên"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "Xung đột"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "Thay thế"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "Làm cũ"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "quan trọng"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "cần"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "chuẩn"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "tùy chọn"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "thêm"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "Đang xây dụng cây cách phụ thuộc..."
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "Phiên bản ứng cử"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "Tạo ra cách phụ thuộc"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "Đang hợp nhất các thông tin sẵn sàng..."
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "Việc mở %s bị lỗi"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "Việc ghi tập tin %s bị lỗi"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "Không thể phân tách tập tin gói %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:186
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "Không thể phân tách tập tin gói %s (2)"
@@@ -2395,7 -2395,7 +2439,7 @@@ msgstr "
  msgid "Opening %s"
  msgstr "Đang mở %s..."
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Dòng %u quá dài trong danh sách nguồn %s."
@@@ -2432,13 -2432,13 +2476,13 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "Không hỗ trợ kiểu tập tin chỉ mục « %s »"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr "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:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2446,7 -2446,7 +2490,7 @@@ msgstr "
  "Lỗi: « pkgProblemResolver::Resolve » (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo "
  "ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này."
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  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."
  
@@@ -2487,12 -2487,12 +2531,12 @@@ msgstr "Phương pháp %s đã không b
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr "Hãy nạp đĩa có nhãn « %s » vào ổ « %s » và bấm nút Enter."
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "Không hỗ trợ hệ thống đóng gói « %s »"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp"
  
@@@ -2531,102 -2531,101 +2575,118 @@@ msgstr "Không hiểu kiểu ghim %s
  msgid "No priority (or zero) specified for pin"
  msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "Bộ nhớ tạm có hệ thống điêu khiển phiên bản không tương thích"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "Gặp lỗi khi xử lý %s (NewPackage - gói mới)"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "Gặp lỗi khi xử lý %s (UsePackage1 - dùng gói 1)"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "Gặp lỗi khi xử lý %s (NewFileVer1 - tập tin mới, phiên bản 1)"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "Gặp lỗi khi xử lý %s (UsePackage2 - dùng gói 2)"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "Gặp lỗi khi xử lý %s (NewFileVer1 - tập tin mới, phiên bản 1)"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "Gặp lỗi khi xử lý %s (NewVersion1 - phiên bản mới 1)"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "Gặp lỗi khi xử lý %s (UsePackage3 - dùng gói 3)"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "Gặp lỗi khi xử lý %s (NewVersion2 - phiên ban mới 2)"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "Gặp lỗi khi xử lý %s (NewFileVer1 - tập tin mới, phiên bản 1)"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý."
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý."
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý."
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý."
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "Gặp lỗi khi xử lý %s (FindPkg - tìm gói)"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr ""
  "Gặp lỗi khi xử lý %s (CollectFileProvides - tập hợp các trường hợp miễn là "
  "một tập tin)"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "Không tìm thấy gói %s %s khi xử lý cách phụ thuộc của/vào tập tin"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "Đang tập hợp các trường hợp « tập tin miễn là »"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)."
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "MD5Sum (tổng kiểm) không khớp được"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2635,7 -2634,7 +2695,7 @@@ msgstr "
  "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
  "này, do thiếu kiến trúc."
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2644,7 -2643,7 +2704,7 @@@ msgstr "
  "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
  "này."
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
@@@ -2652,7 -2651,7 +2712,7 @@@ msgstr "
  "Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập "
  "tin:) cho gói %s."
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "Kích cỡ không khớp được"
  
@@@ -2661,7 -2660,7 +2721,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "Khối nhà bán %s không chứa vân tay"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2670,47 -2669,47 +2730,49 @@@ msgstr "
  "Đang dùng điểm lắp đĩa CD-ROM %s\n"
  "Đang lắp đĩa CD-ROM...\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "Đang nhận diện... "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "Nhãn đã lưu : %s\n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "Đang dùng điểm lắp đĩa CD-ROM %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "Đang tháo lắp đĩa CD-ROM...\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "Đang đợi đĩa...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "Đang lắp đĩa CD-ROM...\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "Mới tìm %i chỉ mục gói, %i chỉ mục nguồn và %i chữ ký\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "Nó không phải là một tên hợp lệ: hãy thử lại.\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2719,38 -2718,38 +2781,38 @@@ msgstr "
  "Tên đĩa này:\n"
  "%s\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "Đang sao chép các danh sách gói..."
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "Đang ghi danh sách nguồn mới...\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "Đang tháo lắp đĩa CD-ROM..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "Mới ghi %i mục ghi.\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "Mới ghi %i mục ghi với %i tập tin còn thiếu.\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "Mới ghi %i mục ghi với %i tập tin không khớp với nhau\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2807,6 -2806,6 +2869,16 @@@ msgstr "Đang chuẩn bị gỡ bỏ ho
  msgid "Completely removed %s"
  msgstr "Mới gỡ bỏ hoàn toàn %s"
  
++#: methods/rred.cc:219
++#, fuzzy
++msgid "Could not patch file"
++msgstr "Không thể mở tập tin %s"
++
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Kết nối bị đóng quá sớm."
++
++#: apt-pkg/acquire-item.cc:1097
++#, fuzzy
++msgid "There is no public key available for the following key IDs:\n"
++msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n"
diff --combined po/zh_CN.po
index 6907d45b8,c38c5f0f4..06ea0e977
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.23\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-10-11 20:34+0200\n"
 -"POT-Creation-Date: 2006-05-27 13:46+0200\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
  "PO-Revision-Date: 2006-02-22 14:20+1300\n"
  "Last-Translator: Carlos Z.F. Liu <carlosliu@users.sourceforge.net>\n"
  "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@@ -15,145 -15,145 +15,155 @@@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "未发现软件包 %s"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "软件包总数(按名称计)："
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  普通软件包："
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  完全虚拟软件包："
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  单虚拟软件包："
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  混合虚拟软件包："
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  缺漏的："
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "按版本共计："
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "按版本共计："
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "按依赖关系共计："
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "按版本/文件关系共计："
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "按版本/文件关系共计："
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "提供映射共计："
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Glob 字串共计："
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "依赖关系版本名所占空间共计："
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Slack 空间共计："
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "总占用空间："
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "软件包文件 %s 尚未同步(sync)。"
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "您必须明确地给出一个表达式"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "没有发现吻合的软件包"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "软件包文件："
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "缓存尚未同步(sync)，无法交差引证(x-ref)一个软件包文件"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "被锁定(pinned)的软件包："
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(没有找到)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "  已安装："
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(无)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  候选的软件包："
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  软件包锁(Pin)："
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  版本列表："
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s for %s %s ，编译于 %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -300,7 -300,7 +310,7 @@@ msgstr "
  "  -c=? 读指定的配置文件\n"
  "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "无法写入 %s"
@@@ -422,126 -422,115 +432,126 @@@ msgstr "没有任何选定项是匹配ç
  msgid "Some files are missing in the package file group `%s'"
  msgstr "软件包文件组“%s”中缺少一些文件"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "缓存数据库被损坏了，该数据库文件的文件名已改成 %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "DB 已过时，现试图进行升级 %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr ""
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "无法打开 DB 文件 %s：%s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "文件 %s 的时间已被改动"
 +msgid "Failed to stat %s"
 +msgstr "无法读取 %s 的状态"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "存档没有包含控制字段"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "无法获得游标(cursor)"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "警告：无法读取目录 %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "警告：无法对 %s 进行统计\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "错误："
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "警告："
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "错误：处理文件时出错 "
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "无法解析路径 %s"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "无法遍历目录树"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "无法打开 %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr " DeLink %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "无法读取符号链接 %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "无法 unlink %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** 无法将 %s 链接到 %s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " 达到了 DeLink 的上限 %sB。\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "无法读取 %s 的状态"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "存档没有包含软件包(package)字段"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr "  %s 中没有 override 项\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "  %s 的维护者 %s 并非 %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, fuzzy, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr "  %s 中没有 override 项\n"
 +
 +#: ftparchive/writer.cc:627
 +#, fuzzy, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr "  %s 中没有 override 项\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -637,79 -626,79 +647,79 @@@ msgstr "在 unlink %s 时出错
  msgid "Failed to rename %s to %s"
  msgstr "无法将 %s 重命名为 %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "Y"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "编译正则表达式时出错 - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "下列的软件包有不能满足的依赖关系："
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "但是 %s 已经安装了"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "但是 %s 正要被安装"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "但却无法安装它"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "但是它只是个虚拟软件包"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "但是它还没有被安装"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "但是它将不会被安装"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr " 或"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "下列【新】软件包将被安装："
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "下列软件包将被【卸载】："
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "下列的软件包的版本将保持不变："
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "下列的软件包将被升级："
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "下列软件包将被【降级】："
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "下列被要求保持版本不变的软件包将被改变："
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s (是由于 %s) "
  
--#: cmdline/apt-get.cc:546
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
@@@ -717,143 -706,143 +727,143 @@@ msgstr "
  "【警告】：下列的重要软件包将被卸载 \n"
  "请勿尝试，除非您确实知道您在做什么！"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "共升级了 %lu 个软件包，新安装了 %lu 个软件包，"
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "共重新安装了 %lu 个软件包，"
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "降级了 %lu 个软件包，"
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "要卸载 %lu 个软件包，有 %lu 个软件未被升级。\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "正在更正依赖关系..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr " 失败。"
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "无法更正依赖关系"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "无法最小化要升级的软件包集合"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " 完成"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。"
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "【警告】：下列的软件包不能通过验证！"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
  msgstr "忽略了认证警告。\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "不经验证就安装这些软件包么？[y/N] "
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "有些软件包不能通过验证"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
  
--#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
  msgstr "内部错误，Ordering 没有完成"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "无法对下载目录加锁"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "无法读取安装源列表。"
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr "怪了……文件大小不符，发信给 apt@packages.debian.org 吧"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "需要下载 %sB/%sB 的软件包。\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "需要下载 %sB 的软件包。\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "解压缩后将会空出 %sB 的空间。\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "无法获知您在 %s 上的空余空间"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "您在 %s 中没有足够的空余空间。"
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "虽然您指定了 Trivial Only，但这不是个日常(trivial)操作。"
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "Yes, do as I say!"
  
--#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:883
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -864,28 -853,28 +874,28 @@@ msgstr "
  "若还想继续的话，就输入下面的短句“%s”\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "中止执行。"
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "您希望继续执行吗？[Y/n]"
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "无法下载 %s  %s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "有一些文件下载失败"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "下载完毕，目前是“仅下载”模式"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -893,47 -882,47 +903,47 @@@ msgstr "
  "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项"
  "再试试？"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "无法更正缺少的软件包。"
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "放弃安装。"
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "注意，我选了 %s 而非 %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "软件包 %s 还未安装，因而不会被卸载\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr " [已安装]"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "请您明确地选择一个来进行安装。"
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -944,74 -933,74 +954,93 @@@ msgstr "
  "这可能意味着这个缺失的软件包可能已被废弃，\n"
  "或者只能在其他发布源中找到\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "可是下列的软件包取代了它："
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "软件包 %s 还没有可供安装的候选者"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "不能重新安装 %s，因为无法下载它。\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "%s 已经是最新的版本了。\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "未找到“%2$s”的“%1$s”发布版本"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "未找到“%2$s”的“%1$s”版本"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "选定了版本为 %s (%s) 的 %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr " update 命令是不需任何参数的"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "无法对状态列表目录加锁"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
  msgstr ""
  "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "下列的信息可能会对解决问题有所帮助："
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "内部错误，problem resolver 坏事了"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "内部错误，AllUpgrade 坏事了"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "无法找到软件包 %s"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1019,7 -1008,7 +1048,7 @@@ msgstr "
  "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
  "以指定一个解决办法)。"
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1030,7 -1019,7 +1059,7 @@@ msgstr "
  "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
  "包尚未被创建或是它们还在新到(incoming)目录中。"
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1039,126 -1028,126 +1068,122 @@@ msgstr "
  "您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n"
  "您最好提交一个针对这个软件包的故障报告。"
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "下列的信息可能会对解决问题有所帮助："
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "无法安装的软件包"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "将会安装下列额外的软件包："
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "建议安装的软件包："
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "推荐安装的软件包："
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "正在筹划升级... "
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "失败"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "完成"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr "内部错误，problem resolver 坏事了"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "要下载源代码，必须指定至少一个对应的软件包"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "无法找到与 %s 对应的源代码包"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr "忽略已下载过的文件“%s”\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "您在 %s 上没有足够的空余空间"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "需要下载 %sB/%sB 的源代码包。\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "需要下载 %sB 的源代码包。\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "下载源代码 %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "有一些包文件无法下载。"
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "运行解包的命令“%s”出错。\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "执行构造软件包命令“%s”失败。\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "子进程出错"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr " %s 没有构建依赖关系信息。\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1167,30 -1156,30 +1192,30 @@@ msgstr "
  "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1"
  "$s 依赖关系"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新了"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "无法处理构建依赖关系"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "被支持模块："
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1367,19 -1356,19 +1392,19 @@@ msgstr "正在合并现有信息
  msgid "Failed to create pipes"
  msgstr "无法创建管道"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "无法执行 gzip"
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "包文件已被损坏"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "tar 的校验码不符，包文件已被损坏"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "未知的 TAR 数据头类型 %u，成员 %s"
@@@ -1524,9 -1513,9 +1549,9 @@@ msgid "The info and temp directories ne
  msgstr "info 和 temp 目录要求处于同一文件系统之下"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "正在读取软件包列表"
  
@@@ -1658,12 -1647,12 +1683,14 @@@ msgstr "找不到光盘。
  msgid "File not found"
  msgstr "无法找到该文件"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "无法读取状态"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "无法设置文件的修改日期"
  
@@@ -1790,7 -1779,7 +1817,7 @@@ msgstr "数据套接字连接超时
  msgid "Unable to accept connection"
  msgstr "无法接受连接"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "把文件加入散列表时出错"
  
@@@ -1874,123 -1863,123 +1901,123 @@@ msgstr "解析“%s:%s”时，出现äº
  msgid "Unable to connect to %s %s:"
  msgstr "不能连接上 %s %s："
  
 -#: methods/gpgv.cc:64
 +#: methods/gpgv.cc:65
  #, fuzzy, c-format
  msgid "Couldn't access keyring: '%s'"
  msgstr "无法解析域名“%s”"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
  msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。"
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
  msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！"
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
  msgstr "至少发现一个无效的签名。"
  
 -#: methods/gpgv.cc:207
 +#: methods/gpgv.cc:213
  #, fuzzy, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
  msgstr "用于验证签名(您安装了 gnupg 么？)"
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
  msgstr "运行 gpgv 时发生未知错误"
  
 -#: methods/gpgv.cc:243
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
  msgstr "下列签名无效：\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
  msgstr "由于没有公钥，下列签名无法进行验证：\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "无法为 %s 开启管道"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "从 %s 进程读取数据出错"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "正在等待报头"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "受到了一行报头条目，它的长度超过了 %u 个字符"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "错误的报头条目"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "该 http 服务器发送了一个无效的应答报头"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "该 http 服务器的 range 支持不正常"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "无法识别的日期格式"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "select 调用出错"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "连接服务器超时"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "写输出文件时出错"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "写文件时出错"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "写文件时出错"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "从服务器读取数据时出错，对方关闭了连接"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "从服务器读取数据出错"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "错误的报头数据"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "连接失败"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "内部错误"
  
@@@ -2003,7 -1992,7 +2030,7 @@@ msgstr "无法 mmap 一个空文件
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "无法 mmap %lu 字节的数据"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "没有发现您的所选 %s"
@@@ -2063,12 -2052,12 +2090,12 @@@ msgstr "语法错误 %s:%u: 不支持çš
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... 有错误!"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... 完成"
@@@ -2200,93 -2189,93 +2227,110 @@@ msgstr "用 unlink 删除文件时出é”
  msgid "Problem syncing the file"
  msgstr "同步文件时出错"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "软件包缓存区是空的"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "软件包缓存区文件损坏了"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "软件包缓存区文件的版本不兼容"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "本程序目前不支持“%s”这个版本控制系统"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "软件包缓存区是为其它架构的主机构造的"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "依赖"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "预依赖"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "建议"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "推荐"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "冲突"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "替换"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "废弃"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "重要"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "必要"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "标准"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "可选"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "额外"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "正在分析软件包的依赖关系树"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "候选版本"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "生成依赖关系"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "正在合并现有信息"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "无法打开 %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "无法写入文件 %s"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "无法解析软件包文件 %s (1)"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "无法解析软件包文件 %s (2)"
@@@ -2321,7 -2310,7 +2365,7 @@@ msgstr "安装源配置文件“%2$s”
  msgid "Opening %s"
  msgstr "正在打开 %s"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。"
@@@ -2357,13 -2346,13 +2401,13 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "不支持索引文件类型“%s”"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。"
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
@@@ -2371,7 -2360,7 +2415,7 @@@ msgstr "
  "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
  "缘故。"
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
@@@ -2414,12 -2403,12 +2458,12 @@@ msgstr "获取软件包的渠道 %s 所
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "不支持“%s”打包系统"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "无法确定适合的打包系统类型"
  
@@@ -2453,100 -2442,99 +2497,116 @@@ msgstr "无法识别锁定的类型(pi
  msgid "No priority (or zero) specified for pin"
  msgstr "没有为版本锁定指定优先级(或为零)"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "软件包暂存区使用的是不兼容的版本控制系统"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "处理 %s (NewPackage)时出错"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "处理 %s (UsePackage1)时出错"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "处理 %s (NewFileVer1)时出错"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "处理 %s (UsePackage2)时出错"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "处理 %s (NewFileVer1)时出错"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "处理 %s (NewVersion1)时出错"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "处理 %s (UsePackage3)时出错"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "处理 %s (NewVersion2)时出错"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "处理 %s (NewFileVer1)时出错"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr "糟了，软件包的数量了超出本程序的处理能力。"
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "糟了，软件包版本的数量了超出本程序的处理能力。"
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "糟了，软件包版本的数量了超出本程序的处理能力。"
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr "糟了，依赖关系的数量超出了本程序的处理能力。"
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "处理 %s (FindPkg)时出错"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "处理 %s (CollectFileProvides)时出错"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "无法获取源软件包列表 %s 的状态"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "正在收集文件所提供的软件包"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "无法写入来源缓存文件"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "无法重命名文件，%s (%s -> %s)。"
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "MD5 校验和不符"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
  msgstr "以下 key ID 没有可用的公钥：\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
@@@ -2555,7 -2543,7 +2615,7 @@@ msgstr "
  "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
  "包。(缘于架构缺失)"
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
@@@ -2563,13 -2551,13 +2623,13 @@@
  msgstr ""
  "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "大小不符"
  
@@@ -2578,7 -2566,7 +2638,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "软件提供者数据块内 %s 没有包含指纹信息"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2587,47 -2575,47 +2647,49 @@@ msgstr "
  "现把 %s 作为了 CD-ROM 的挂载点\n"
  "正在挂载 CD-ROM\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "正在鉴别.. "
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "存档标签：%s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "正在卸载 CD-ROM 文件系统\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "等待插入盘片……\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "正在挂载 CD-ROM 文件系统……\n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "正在光盘中查找索引文件..\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "找到了 %i 个软件包索引、%i 个源代码包索引，和 %i 个数字签名\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "这不是一个有效的名字，请再次命名。\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2636,38 -2624,38 +2698,38 @@@ msgstr "
  "这张光盘现在的名字是：\n"
  "“%s”\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "正在复制软件包列表……"
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "正在写入新的软件包源列表\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "对应于该光盘的软件包源设置项是：\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "正在卸载 CD-ROM 文件系统……"
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "已写入 %i 条记录。\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "已写入 %i 条记录，并有 %i 个文件不吻合\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n"
@@@ -2722,17 -2710,31 +2784,23 @@@ msgstr "正在准备配置 %s
  msgid "Completely removed %s"
  msgstr "无法删除 %s"
  
++#: methods/rred.cc:219
++#, fuzzy
++msgid "Could not patch file"
++msgstr "无法打开文件 %s"
++
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "连接被永久关闭"
  
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
 -msgstr ""
 -
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr "  %s 中没有 override 项\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr "  %s 中没有 override 项\n"
 -
 -#: methods/rred.cc:219
++#: apt-pkg/acquire-item.cc:1097
+ #, fuzzy
 -msgid "Could not patch file"
 -msgstr "无法打开文件 %s"
++msgid "There is no public key available for the following key IDs:\n"
++msgstr "以下 key ID 没有可用的公钥：\n"
++
 +#~ msgid "File date has changed %s"
 +#~ msgstr "文件 %s 的时间已被改动"
  
- #, fuzzy
- #~ msgid "Could not patch file"
- #~ msgstr "无法打开文件 %s"
- 
  #~ msgid "Reading file list"
  #~ msgstr "正在读取文件列表"
  
diff --combined po/zh_TW.po
index f1498dbc7,2057703ff..9ec8c24ad
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@@ -8,153 -8,153 +8,163 @@@ msgid "
  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: 2006-05-27 13:46+0200\n"
 -"PO-Revision-Date: 2005-02-19 22:24+0800\n"
++"POT-Creation-Date: 2006-08-15 15:55+0200\n"
 +"PO-Revision-Date: 2006-10-21 16:58+0800\n"
  "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
  "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
--#: cmdline/apt-cache.cc:135
++#: cmdline/apt-cache.cc:141
  #, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "套件 %s 版本 %s 有未解決的相依問題:\n"
  
--#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
--#: cmdline/apt-cache.cc:1508
++#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
++#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
++#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564
  #, c-format
  msgid "Unable to locate package %s"
  msgstr "無法找出套件 %s 的位置"
  
--#: cmdline/apt-cache.cc:232
++#: cmdline/apt-cache.cc:245
  msgid "Total package names : "
  msgstr "所有套件的名稱"
  
--#: cmdline/apt-cache.cc:272
++#: cmdline/apt-cache.cc:285
  msgid "  Normal packages: "
  msgstr "  普通套件："
  
--#: cmdline/apt-cache.cc:273
++#: cmdline/apt-cache.cc:286
  msgid "  Pure virtual packages: "
  msgstr "  虛擬套件："
  
--#: cmdline/apt-cache.cc:274
++#: cmdline/apt-cache.cc:287
  msgid "  Single virtual packages: "
  msgstr "  單虛擬套件："
  
--#: cmdline/apt-cache.cc:275
++#: cmdline/apt-cache.cc:288
  msgid "  Mixed virtual packages: "
  msgstr "  混合虛擬套件："
  
--#: cmdline/apt-cache.cc:276
++#: cmdline/apt-cache.cc:289
  msgid "  Missing: "
  msgstr "  失蹤："
  
--#: cmdline/apt-cache.cc:278
++#: cmdline/apt-cache.cc:291
  msgid "Total distinct versions: "
  msgstr "所有不同版本"
  
--#: cmdline/apt-cache.cc:280
++#: cmdline/apt-cache.cc:293
++#, fuzzy
++msgid "Total Distinct Descriptions: "
++msgstr "所有不同版本"
++
++#: cmdline/apt-cache.cc:295
  msgid "Total dependencies: "
  msgstr "所有依存關係："
  
--#: cmdline/apt-cache.cc:283
++#: cmdline/apt-cache.cc:298
  msgid "Total ver/file relations: "
  msgstr "所有版本/檔案關聯："
  
--#: cmdline/apt-cache.cc:285
++#: cmdline/apt-cache.cc:300
++#, fuzzy
++msgid "Total Desc/File relations: "
++msgstr "所有版本/檔案關聯："
++
++#: cmdline/apt-cache.cc:302
  msgid "Total Provides mappings: "
  msgstr "所有提供套件對應："
  
--#: cmdline/apt-cache.cc:297
++#: cmdline/apt-cache.cc:314
  msgid "Total globbed strings: "
  msgstr "Glob 字串共計:"
  
--#: cmdline/apt-cache.cc:311
++#: cmdline/apt-cache.cc:328
  msgid "Total dependency version space: "
  msgstr "所有相依版本空間:"
  
--#: cmdline/apt-cache.cc:316
++#: cmdline/apt-cache.cc:333
  msgid "Total slack space: "
  msgstr "Slack 空間共計:"
  
--#: cmdline/apt-cache.cc:324
++#: cmdline/apt-cache.cc:341
  msgid "Total space accounted for: "
  msgstr "所有統計後的空間:"
  
--#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "套件檔案 %s 已失去同步。"
  
--#: cmdline/apt-cache.cc:1231
++#: cmdline/apt-cache.cc:1287
  msgid "You must give exactly one pattern"
  msgstr "您必須給定一完整的樣式"
  
--#: cmdline/apt-cache.cc:1385
++#: cmdline/apt-cache.cc:1441
  msgid "No packages found"
  msgstr "未找到套件"
  
--#: cmdline/apt-cache.cc:1462
++#: cmdline/apt-cache.cc:1518
  msgid "Package files:"
  msgstr "套件檔案:"
  
--#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "快取資料同步過時,無法 x-ref 套件檔案"
  
--#: cmdline/apt-cache.cc:1470
++#: cmdline/apt-cache.cc:1526
  #, c-format
  msgid "%4i %s\n"
  msgstr "%4i %s\n"
  
  #. Show any packages have explicit pins
--#: cmdline/apt-cache.cc:1482
++#: cmdline/apt-cache.cc:1538
  msgid "Pinned packages:"
  msgstr "鎖定的套件:"
  
--#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
  msgid "(not found)"
  msgstr "(未找到)"
  
  #. Installed version
--#: cmdline/apt-cache.cc:1515
++#: cmdline/apt-cache.cc:1571
  msgid "  Installed: "
  msgstr "已安裝:"
  
--#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
  msgid "(none)"
  msgstr "(沒有)"
  
  #. Candidate Version
--#: cmdline/apt-cache.cc:1522
++#: cmdline/apt-cache.cc:1578
  msgid "  Candidate: "
  msgstr "  候選:"
  
--#: cmdline/apt-cache.cc:1532
++#: cmdline/apt-cache.cc:1588
  msgid "  Package pin: "
  msgstr "  套件鎖定: "
  
  #. Show the priority tables
--#: cmdline/apt-cache.cc:1541
++#: cmdline/apt-cache.cc:1597
  msgid "  Version table:"
  msgstr "  版本表格:"
  
--#: cmdline/apt-cache.cc:1556
++#: cmdline/apt-cache.cc:1612
  #, c-format
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
  #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
- #: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
 -#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s 是針對於 %s %s 並編譯在 %s %s\n"
  
--#: cmdline/apt-cache.cc:1659
++#: cmdline/apt-cache.cc:1715
  msgid ""
  "Usage: apt-cache [options] command\n"
  "       apt-cache [options] add file1 [file2 ...]\n"
@@@ -230,15 -230,19 +240,15 @@@ msgstr "
  
  #: cmdline/apt-cdrom.cc:78
  msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
 -msgstr ""
 +msgstr "請給這張光碟取個名字，比如說“Debian 2.1r1 Disk 1”"
  
  #: cmdline/apt-cdrom.cc:93
 -#, fuzzy
  msgid "Please insert a Disc in the drive and press enter"
 -msgstr ""
 -"更換媒體:請把名為\n"
 -" '%s' 的光碟\n"
 -"插入 '%s' 碟機,然後按 [Enter] 鍵。\n"
 +msgstr "請放入光碟至光碟機，然後按 [Enter] 鍵。"
  
  #: cmdline/apt-cdrom.cc:117
  msgid "Repeat this process for the rest of the CDs in your set."
 -msgstr ""
 +msgstr "請對您的光碟套件中的其它光碟重復相同的操作。"
  
  #: cmdline/apt-config.cc:41
  msgid "Arguments not in pairs"
@@@ -301,7 -305,7 +311,7 @@@ msgstr "
  "  -c=? 讀取指定的設定檔案\n"
  "  -o=? 設定任意指定的設定選項,例如:-o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
  #, c-format
  msgid "Unable to write to %s"
  msgstr "無法寫入『%s』。"
@@@ -335,6 -339,7 +345,6 @@@ msgid "Error processing contents %s
  msgstr "處理目錄 %s 時出錯"
  
  #: ftparchive/apt-ftparchive.cc:556
 -#, fuzzy
  msgid ""
  "Usage: apt-ftparchive [options] command\n"
  "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@@ -423,126 -428,115 +433,126 @@@ msgstr "找不到符合的選項
  msgid "Some files are missing in the package file group `%s'"
  msgstr "套件檔案組  `%s' 缺少部份檔案"
  
 -#: ftparchive/cachedb.cc:45
 +#: ftparchive/cachedb.cc:47
  #, c-format
  msgid "DB was corrupted, file renamed to %s.old"
  msgstr "DB 已損毀,檔案被更名成 %s.old"
  
 -#: ftparchive/cachedb.cc:63
 +#: ftparchive/cachedb.cc:65
  #, c-format
  msgid "DB is old, attempting to upgrade %s"
  msgstr "DB 過舊,嘗試更新 %s"
  
 -#: ftparchive/cachedb.cc:73
 +#: ftparchive/cachedb.cc:76
 +msgid ""
 +"DB format is invalid. If you upgraded from a older version of apt, please "
 +"remove and re-create the database."
 +msgstr "資料庫格式錯誤。如果您升級舊版的 apt，請移除並重建資料庫。"
 +
 +#: ftparchive/cachedb.cc:81
  #, c-format
  msgid "Unable to open DB file %s: %s"
  msgstr "無法開啟 DB 檔案 %s:%s"
  
 -#: ftparchive/cachedb.cc:114
 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
  #, c-format
 -msgid "File date has changed %s"
 -msgstr "檔案資料已更改 %s"
 +msgid "Failed to stat %s"
 +msgstr "無法取得 %s 的狀態"
  
 -#: ftparchive/cachedb.cc:155
 +#: ftparchive/cachedb.cc:242
  msgid "Archive has no control record"
  msgstr "檔案沒有 control 記錄"
  
 -#: ftparchive/cachedb.cc:267
 +#: ftparchive/cachedb.cc:448
  msgid "Unable to get a cursor"
  msgstr "無法取得游標"
  
 -#: ftparchive/writer.cc:78
 +#: ftparchive/writer.cc:79
  #, c-format
  msgid "W: Unable to read directory %s\n"
  msgstr "W:無法讀取目錄 %s\n"
  
 -#: ftparchive/writer.cc:83
 +#: ftparchive/writer.cc:84
  #, c-format
  msgid "W: Unable to stat %s\n"
  msgstr "W:無法取得 %s 狀態\n"
  
 -#: ftparchive/writer.cc:125
 +#: ftparchive/writer.cc:135
  msgid "E: "
  msgstr "錯誤："
  
 -#: ftparchive/writer.cc:127
 +#: ftparchive/writer.cc:137
  msgid "W: "
  msgstr "警告："
  
 -#: ftparchive/writer.cc:134
 +#: ftparchive/writer.cc:144
  msgid "E: Errors apply to file "
  msgstr "E:套用到檔案時出錯"
  
 -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "無法解析路徑 %s"
  
 -#: ftparchive/writer.cc:163
 +#: ftparchive/writer.cc:173
  msgid "Tree walking failed"
  msgstr "無法走訪目錄樹"
  
 -#: ftparchive/writer.cc:188
 +#: ftparchive/writer.cc:198
  #, c-format
  msgid "Failed to open %s"
  msgstr "無法開啟 %s"
  
 -#: ftparchive/writer.cc:245
 +#: ftparchive/writer.cc:257
  #, c-format
  msgid " DeLink %s [%s]\n"
  msgstr " 移除連結 %s [%s]\n"
  
 -#: ftparchive/writer.cc:253
 +#: ftparchive/writer.cc:265
  #, c-format
  msgid "Failed to readlink %s"
  msgstr "無法讀取符號鏈接 %s"
  
 -#: ftparchive/writer.cc:257
 +#: ftparchive/writer.cc:269
  #, c-format
  msgid "Failed to unlink %s"
  msgstr "無法 unlink %s"
  
 -#: ftparchive/writer.cc:264
 +#: ftparchive/writer.cc:276
  #, c-format
  msgid "*** Failed to link %s to %s"
  msgstr "*** 無法將 %s 鏈接到 %s"
  
 -#: ftparchive/writer.cc:274
 +#: ftparchive/writer.cc:286
  #, c-format
  msgid " DeLink limit of %sB hit.\n"
  msgstr " 達到了 DeLink 的上限 %sB。\n"
  
 -#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 -#, c-format
 -msgid "Failed to stat %s"
 -msgstr "無法取得 %s 的狀態"
 -
 -#: ftparchive/writer.cc:386
 +#: ftparchive/writer.cc:390
  msgid "Archive had no package field"
  msgstr "檔案無套件字符"
  
 -#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr "  %s 無 override 項目\n"
  
 -#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "  %s 套件維護者是 %s 非 %s\n"
  
 +#: ftparchive/writer.cc:623
 +#, c-format
 +msgid "  %s has no source override entry\n"
 +msgstr "  %s 無原始碼 override 項目\n"
 +
 +#: ftparchive/writer.cc:627
 +#, c-format
 +msgid "  %s has no binary override entry either\n"
 +msgstr "  %s 無二元碼 override 項目\n"
 +
  #: ftparchive/contents.cc:317
  #, c-format
  msgid "Internal error, could not locate member %s"
@@@ -638,224 -632,226 +648,224 @@@ msgstr "在 unlink %s 時出錯
  msgid "Failed to rename %s to %s"
  msgstr "無法將 %s 更名為 %s"
  
--#: cmdline/apt-get.cc:120
++#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr "Y"
  
--#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "編譯正規表示法出錯 - %s"
  
--#: cmdline/apt-get.cc:237
++#: cmdline/apt-get.cc:238
  msgid "The following packages have unmet dependencies:"
  msgstr "下列的套件有無法滿足的依存關係："
  
--#: cmdline/apt-get.cc:327
++#: cmdline/apt-get.cc:328
  #, c-format
  msgid "but %s is installed"
  msgstr "但是『%s』卻已經安裝好了。"
  
--#: cmdline/apt-get.cc:329
++#: cmdline/apt-get.cc:330
  #, c-format
  msgid "but %s is to be installed"
  msgstr "但是『%s』卻將被安裝。"
  
--#: cmdline/apt-get.cc:336
++#: cmdline/apt-get.cc:337
  msgid "but it is not installable"
  msgstr "但是它卻無法安裝。"
  
--#: cmdline/apt-get.cc:338
++#: cmdline/apt-get.cc:339
  msgid "but it is a virtual package"
  msgstr "但是它只是虛擬的套件"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not installed"
  msgstr "但是『』卻還沒有安裝。"
  
--#: cmdline/apt-get.cc:341
++#: cmdline/apt-get.cc:342
  msgid "but it is not going to be installed"
  msgstr "但是它卻不會被安裝。"
  
--#: cmdline/apt-get.cc:346
++#: cmdline/apt-get.cc:347
  msgid " or"
  msgstr "或"
  
--#: cmdline/apt-get.cc:375
++#: cmdline/apt-get.cc:376
  msgid "The following NEW packages will be installed:"
  msgstr "下列的【新】套件都將被安裝："
  
--#: cmdline/apt-get.cc:401
++#: cmdline/apt-get.cc:402
  msgid "The following packages will be REMOVED:"
  msgstr "下列的套件都將被【刪除】："
  
--#: cmdline/apt-get.cc:423
++#: cmdline/apt-get.cc:424
  msgid "The following packages have been kept back:"
  msgstr "下列的套件都將維持舊版本:"
  
--#: cmdline/apt-get.cc:444
++#: cmdline/apt-get.cc:445
  msgid "The following packages will be upgraded:"
  msgstr "下列的套件都將更新:"
  
--#: cmdline/apt-get.cc:465
++#: cmdline/apt-get.cc:466
  msgid "The following packages will be DOWNGRADED:"
  msgstr "下列的套件都將被「降級」:"
  
--#: cmdline/apt-get.cc:485
++#: cmdline/apt-get.cc:486
  msgid "The following held packages will be changed:"
  msgstr "下列押後的套件都將被更改："
  
--#: cmdline/apt-get.cc:538
++#: cmdline/apt-get.cc:539
  #, c-format
  msgid "%s (due to %s) "
  msgstr "%s（因為 %s）"
  
--#: cmdline/apt-get.cc:546
 -#, fuzzy
++#: cmdline/apt-get.cc:547
  msgid ""
  "WARNING: The following essential packages will be removed.\n"
  "This should NOT be done unless you know exactly what you are doing!"
  msgstr ""
 -"警告：下列的重要套件都將被刪除\n"
 +"警告：下列的基本套件都將被移除。\n"
  "除非您很清楚在做什麼，請勿輕易嘗試。"
  
--#: cmdline/apt-get.cc:577
++#: cmdline/apt-get.cc:578
  #, c-format
  msgid "%lu upgraded, %lu newly installed, "
  msgstr "更新 %lu 個套件，新安裝 %lu 個套件，"
  
--#: cmdline/apt-get.cc:581
++#: cmdline/apt-get.cc:582
  #, c-format
  msgid "%lu reinstalled, "
  msgstr "重新安裝 %lu 個套件，"
  
--#: cmdline/apt-get.cc:583
++#: cmdline/apt-get.cc:584
  #, c-format
  msgid "%lu downgraded, "
  msgstr "降 %lu 個套件的版，"
  
--#: cmdline/apt-get.cc:585
++#: cmdline/apt-get.cc:586
  #, c-format
  msgid "%lu to remove and %lu not upgraded.\n"
  msgstr "刪除 %lu 個套件，另不更新 %lu 個套件。\n"
  
--#: cmdline/apt-get.cc:589
++#: cmdline/apt-get.cc:590
  #, c-format
  msgid "%lu not fully installed or removed.\n"
  msgstr "%lu 個套件沒有完全安裝或刪除完畢。\n"
  
--#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:664
  msgid "Correcting dependencies..."
  msgstr "更正依存關係中..."
  
--#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:667
  msgid " failed."
  msgstr "失敗"
  
--#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:670
  msgid "Unable to correct dependencies"
  msgstr "無法更正依存關係。"
  
--#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:673
  msgid "Unable to minimize the upgrade set"
  msgstr "無法最小化升級的套件集合"
  
--#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:675
  msgid " Done"
  msgstr " 完成"
  
--#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:679
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr "用『apt-get -f install』指令或許能修正這些問題。"
  
--#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:682
  msgid "Unmet dependencies. Try using -f."
  msgstr "無法滿足相依關係。試試看 -f 選項。"
  
--#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:704
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr "警告：下列的套件驗證失敗！"
  
--#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:708
  msgid "Authentication warning overridden.\n"
 -msgstr ""
 +msgstr "忽略了認證警告。\n"
  
--#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:715
  msgid "Install these packages without verification [y/N]? "
  msgstr "不驗證這些套件就直接安裝？[y/N]"
  
--#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:717
  msgid "Some packages could not be authenticated"
  msgstr "部份套件無法驗證"
  
--#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
  msgid "There are problems and -y was used without --force-yes"
  msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes"
  
--#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:770
  msgid "Internal error, InstallPackages was called with broken packages!"
 -msgstr ""
 +msgstr "內部錯誤，InstallPackages 被用在了無法安裝的套上！"
  
--#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:779
  msgid "Packages need to be removed but remove is disabled."
  msgstr "有套件需要被移除,但移除動作被禁止。"
  
--#: cmdline/apt-get.cc:775
 -#, fuzzy
++#: cmdline/apt-get.cc:790
  msgid "Internal error, Ordering didn't finish"
 -msgstr "內部錯誤：新增轉移(diversion)失敗"
 +msgstr "內部錯誤，Ordering didn't finish"
  
- #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr "無法鎖定下載的目錄"
  
- #: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "無法讀取來源單。"
  
--#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:831
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 -msgstr ""
 +msgstr "怪了……檔案大小不符，發信給 apt@packages.debian.org 吧"
  
--#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:836
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr "需要下載 %2$sB 中 %1$sB 的檔案。\n"
  
--#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:839
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr "需要下載 %sB 的檔案。\n"
  
--#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:844
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr "解壓縮後將消耗 %sB 的空間。\n"
  
--#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:847
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "解壓縮後將空出 %sB 的空間。\n"
  
- #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 -#, fuzzy, c-format
++#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
 +#, c-format
  msgid "Couldn't determine free space in %s"
 -msgstr "『%s』內沒有足夠的空間。"
 +msgstr "%s 無法足夠的空間。"
  
--#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:864
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "『%s』內沒有足夠的空間。"
  
--#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "雖然您指定了 Trivial Only,但這不是個顯而易懂的(trivial)操作。"
  
--#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:881
  msgid "Yes, do as I say!"
  msgstr "是的,請執行我所指定的"
  
--#: cmdline/apt-get.cc:868
 -#, fuzzy, c-format
++#: cmdline/apt-get.cc:883
 +#, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
  "To continue type in the phrase '%s'\n"
@@@ -865,28 -861,28 +875,28 @@@ msgstr "
  "若要繼續的話,就輸入下面的句子“%s”\n"
  " ?] "
  
--#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
  msgid "Abort."
  msgstr "放棄執行。"
  
--#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:904
  msgid "Do you want to continue [Y/n]? "
  msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 "
  
- #: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "無法下載『%s』檔案。%s\n"
  
--#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:994
  msgid "Some files failed to download"
  msgstr "部份檔案無法下載"
  
- #: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr "下載完畢,目前是“僅下載”模式"
  
--#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:1001
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
@@@ -894,47 -890,47 +904,47 @@@ msgstr "
  "有幾個檔案無法下載,您可以執行 apt-get update 或者嘗試加上--fix-missing \n"
  "選項?"
  
--#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:1005
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr "目前還不支援 --fix-missing 和媒體置換(media swapping)"
  
--#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:1010
  msgid "Unable to correct missing packages."
  msgstr "無法更正遺失的套件。"
  
--#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:1011
  msgid "Aborting install."
  msgstr "放棄安裝。"
  
--#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1045
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr "注意,選擇了 %s 而非 %s\n"
  
--#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1055
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr "忽略 %s,它已經被安裝而且沒有指定要升級。\n"
  
--#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1073
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr "套件『%s』沒有安裝，所以無法刪除。\n"
  
--#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1084
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr "虛擬套件『%s』的提供者是：\n"
  
--#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1096
  msgid " [Installed]"
  msgstr "【已安裝】"
  
--#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1101
  msgid "You should explicitly select one to install."
  msgstr "請您明確地選擇一個來進行安裝。"
  
--#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1106
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -945,73 -941,73 +955,92 @@@ msgstr "
  "這可能意味著這個套件已經消失或捨棄,\n"
  "或者只能在其他原碼中找到\n"
  
--#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1125
  msgid "However the following packages replace it:"
  msgstr "但是下列的套件將取代它："
  
--#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1128
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr "套件 %s 還沒有可供安裝的候選版本"
  
--#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1148
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr "不能重新安裝 %s,因為無法下載它。\n"
  
--#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1156
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr "『%s』已經是最新版本了。\n"
  
--#: cmdline/apt-get.cc:1168
++#: cmdline/apt-get.cc:1185
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr "未找到“%2$s”的“%1$s”發布版本"
  
--#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1187
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr "未找到“%2$s”的“%1$s”版本"
  
--#: cmdline/apt-get.cc:1176
++#: cmdline/apt-get.cc:1193
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr "選定的版本為 %s (%s) 的 %s\n"
  
--#: cmdline/apt-get.cc:1313
++#: cmdline/apt-get.cc:1330
  msgid "The update command takes no arguments"
  msgstr "update 指令不需任何參數"
  
--#: cmdline/apt-get.cc:1326
++#: cmdline/apt-get.cc:1343
  msgid "Unable to lock the list directory"
  msgstr "無法鎖定列表目錄"
  
--#: cmdline/apt-get.cc:1384
++#: cmdline/apt-get.cc:1401
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
  msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉而使用了舊的索引檔案。"
  
--#: cmdline/apt-get.cc:1403
++#: cmdline/apt-get.cc:1415
++msgid "We are not supposed to delete stuff, can't start AutoRemover"
++msgstr ""
++
++#: cmdline/apt-get.cc:1440
++msgid ""
++"Hmm, seems like the AutoRemover destroyed something which really\n"
++"shouldn't happen. Please file a bug report against apt."
++msgstr ""
++
++#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
++msgid "The following information may help to resolve the situation:"
++msgstr "底下的資訊有助於解決現在的情況:"
++
++#: cmdline/apt-get.cc:1447
++#, fuzzy
++msgid "Internal Error, AutoRemover broke stuff"
++msgstr "內部錯誤，problem resolver 處理失敗"
++
++#: cmdline/apt-get.cc:1466
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "內部錯誤,AllUpgrade 造成錯誤"
  
--#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "無法找到 %s 套件。"
  
--#: cmdline/apt-get.cc:1516
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n"
  
--#: cmdline/apt-get.cc:1546
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "用『apt-get -f install』指令或許能修正這些問題。"
  
--#: cmdline/apt-get.cc:1549
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
@@@ -1019,7 -1015,7 +1048,7 @@@ msgstr "
  "無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n"
  "定一個解決辦法)。"
  
--#: cmdline/apt-get.cc:1561
++#: cmdline/apt-get.cc:1629
  msgid ""
  "Some packages could not be installed. This may mean that you have\n"
  "requested an impossible situation or if you are using the unstable\n"
@@@ -1030,7 -1026,7 +1059,7 @@@ msgstr "
  "或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n"
  "或從 Incoming 目錄移除。"
  
--#: cmdline/apt-get.cc:1569
++#: cmdline/apt-get.cc:1637
  msgid ""
  "Since you only requested a single operation it is extremely likely that\n"
  "the package is simply not installable and a bug report against\n"
@@@ -1040,126 -1036,127 +1069,122 @@@ msgstr "
  "該套件無法安裝,您最好提交一個針對這個套件\n"
  "的臭蟲報告。"
  
--#: cmdline/apt-get.cc:1574
--msgid "The following information may help to resolve the situation:"
--msgstr "底下的資訊有助於解決現在的情況:"
--
--#: cmdline/apt-get.cc:1577
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr "損毀的套件"
  
--#: cmdline/apt-get.cc:1603
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr "下列的【新】套件都將被安裝："
  
- #: cmdline/apt-get.cc:1692
 -#: cmdline/apt-get.cc:1674
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr "建議(Suggested)的套件:"
  
- #: cmdline/apt-get.cc:1693
 -#: cmdline/apt-get.cc:1675
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr "推薦(Recommended)的套件:"
  
- #: cmdline/apt-get.cc:1713
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr "籌畫升級套件中..."
  
- #: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "失敗"
  
- #: cmdline/apt-get.cc:1721
 -#: cmdline/apt-get.cc:1703
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr "完成"
  
- #: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
 -#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 -#, fuzzy
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
 -msgstr "內部錯誤,AllUpgrade 造成錯誤"
 +msgstr "內部錯誤，problem resolver 處理失敗"
  
- #: cmdline/apt-get.cc:1894
 -#: cmdline/apt-get.cc:1876
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr "必須指定至少一個對應的套件才能下載源碼"
  
- #: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
 -#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "無法找到 %s 套件的源碼"
  
- #: cmdline/apt-get.cc:1968
 -#: cmdline/apt-get.cc:1950
 -#, fuzzy, c-format
++#: cmdline/apt-get.cc:2043
 +#, c-format
  msgid "Skipping already downloaded file '%s'\n"
 -msgstr "略過已經被解開到 %s 目錄的源碼檔案\n"
 +msgstr "略過已被下載的檔案“%s”\n"
  
- #: cmdline/apt-get.cc:1992
 -#: cmdline/apt-get.cc:1974
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr "『%s』內沒有足夠的空間。"
  
- #: cmdline/apt-get.cc:1997
 -#: cmdline/apt-get.cc:1979
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n"
  
- #: cmdline/apt-get.cc:2000
 -#: cmdline/apt-get.cc:1982
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr "需要下載 %sB 的原始檔案。\n"
  
- #: cmdline/apt-get.cc:2006
 -#: cmdline/apt-get.cc:1988
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr "下載源碼 %s\n"
  
- #: cmdline/apt-get.cc:2037
 -#: cmdline/apt-get.cc:2019
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr "無法下載某些檔案。"
  
- #: cmdline/apt-get.cc:2065
 -#: cmdline/apt-get.cc:2047
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr "略過已經被解開到 %s 目錄的源碼檔案\n"
  
- #: cmdline/apt-get.cc:2077
 -#: cmdline/apt-get.cc:2059
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr "執行解開套件指令 '%s' 時失敗。\n"
  
- #: cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:2060
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
 -msgstr ""
 +msgstr "請檢查是否安裝了“dpkg-dev”套件。\n"
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2077
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr "執行建立套件指令 '%s' 時失敗。\n"
  
- #: cmdline/apt-get.cc:2114
 -#: cmdline/apt-get.cc:2096
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr "子程序失敗"
  
- #: cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:2112
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)"
  
- #: cmdline/apt-get.cc:2158
 -#: cmdline/apt-get.cc:2140
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr "無法取得 %s 的建構相依關係。"
  
- #: cmdline/apt-get.cc:2178
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr "%s 無建立相依關係訊息。\n"
  
- #: cmdline/apt-get.cc:2230
 -#: cmdline/apt-get.cc:2212
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr "由於無法找到套件 %3$s ,因此不能滿足 %2$s 所要求的 %1$s 相依關係"
  
- #: cmdline/apt-get.cc:2282
 -#: cmdline/apt-get.cc:2264
++#: cmdline/apt-get.cc:2357
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because no available versions of "
@@@ -1168,30 -1165,30 +1193,30 @@@ msgstr "
  "由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的"
  "相依關係"
  
- #: cmdline/apt-get.cc:2317
 -#: cmdline/apt-get.cc:2299
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:已安裝的套件 %3$s 太新了"
  
- #: cmdline/apt-get.cc:2342
 -#: cmdline/apt-get.cc:2324
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s"
  
- #: cmdline/apt-get.cc:2356
 -#: cmdline/apt-get.cc:2338
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr "無法滿足套件 %s 所要求的建構相依關係。"
  
- #: cmdline/apt-get.cc:2360
 -#: cmdline/apt-get.cc:2342
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr "無法處理建構相依關係"
  
- #: cmdline/apt-get.cc:2392
 -#: cmdline/apt-get.cc:2374
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr "支援模組:"
  
- #: cmdline/apt-get.cc:2433
 -#: cmdline/apt-get.cc:2415
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1370,19 -1367,19 +1395,19 @@@ msgstr "結合現有資料中
  msgid "Failed to create pipes"
  msgstr "無法建立管線"
  
 -#: apt-inst/contrib/extracttar.cc:143
 +#: apt-inst/contrib/extracttar.cc:144
  msgid "Failed to exec gzip "
  msgstr "無法執行 gzip"
  
 -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
  msgid "Corrupted archive"
  msgstr "損毀的檔案"
  
 -#: apt-inst/contrib/extracttar.cc:195
 +#: apt-inst/contrib/extracttar.cc:196
  msgid "Tar checksum failed, archive corrupted"
  msgstr "Tar checksum 失敗,檔案已損毀"
  
 -#: apt-inst/contrib/extracttar.cc:298
 +#: apt-inst/contrib/extracttar.cc:299
  #, c-format
  msgid "Unknown TAR header type %u, member %s"
  msgstr "未知的 TAR 標頭型別 %u, member 訊息 %s"
@@@ -1439,7 -1436,7 +1464,7 @@@ msgid "Duplicate conf file %s/%s
  msgstr "重複的設定檔 %s/%s"
  
  #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
 -#, fuzzy, c-format
 +#, c-format
  msgid "Failed to write file %s"
  msgstr "寫入檔案 %s 失敗"
  
@@@ -1527,9 -1524,9 +1552,9 @@@ msgid "The info and temp directories ne
  msgstr "資料目錄與暫存目錄需在同一檔案系統"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
--#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:750
++#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
++#: apt-pkg/pkgcachegen.cc:947
  msgid "Reading package lists"
  msgstr "讀取套件清單中"
  
@@@ -1654,19 -1651,20 +1679,21 @@@ msgid "Unable to unmount the CD-ROM in 
  msgstr "無法下駕『%s』內的碟片，或許它仍在使用中。"
  
  #: methods/cdrom.cc:169
 -#, fuzzy
  msgid "Disk not found."
 -msgstr "找不到檔案"
 +msgstr "找不到磁碟"
  
  #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
  msgid "File not found"
  msgstr "找不到檔案"
  
- #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
- #: methods/gzip.cc:150
 -#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 -#: methods/gzip.cc:142
++#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
++#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
++#: methods/gzip.cc:141 methods/gzip.cc:150
  msgid "Failed to stat"
  msgstr "無法讀取資料"
  
- #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 -#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
++#: methods/rred.cc:240 methods/gzip.cc:147
  msgid "Failed to set modification time"
  msgstr "日期更新失敗"
  
@@@ -1792,7 -1790,7 +1819,7 @@@ msgstr "Data socket 連線逾時
  msgid "Unable to accept connection"
  msgstr "無法允許連線"
  
--#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "問題雜湊表"
  
@@@ -1876,123 -1874,124 +1903,123 @@@ msgstr "無法解析『%s:%s (%i)』。
  msgid "Unable to connect to %s %s:"
  msgstr "無法聯絡到主機『%s %s』："
  
 -#: methods/gpgv.cc:64
 -#, fuzzy, c-format
 +#: methods/gpgv.cc:65
 +#, c-format
  msgid "Couldn't access keyring: '%s'"
 -msgstr "無法解析位置 %s"
 +msgstr "無法存取keyring：%s"
  
 -#: methods/gpgv.cc:99
 +#: methods/gpgv.cc:100
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 -msgstr ""
 +msgstr "錯誤：Acquire::gpgv::Options 的參數列表超長。結束執行。"
  
 -#: methods/gpgv.cc:198
 +#: methods/gpgv.cc:204
  msgid ""
  "Internal error: Good signature, but could not determine key fingerprint?!"
 -msgstr ""
 +msgstr "內部錯誤：簽名正確無誤，但是無法確認密鑰的指紋(key fingerprint)？！"
  
 -#: methods/gpgv.cc:203
 +#: methods/gpgv.cc:209
  msgid "At least one invalid signature was encountered."
 -msgstr ""
 +msgstr "至少發現一個無效的簽名。"
  
 -#: methods/gpgv.cc:207
 +#: methods/gpgv.cc:213
  #, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 -msgstr ""
 +msgstr "無法執行“%s”來驗證簽名(您安裝了 gnupg 嗎？)"
  
 -#: methods/gpgv.cc:212
 +#: methods/gpgv.cc:218
  msgid "Unknown error executing gpgv"
 -msgstr ""
 +msgstr "執行 gpgv 時發生未知錯誤"
  
 -#: methods/gpgv.cc:243
 -#, fuzzy
 +#: methods/gpgv.cc:249
  msgid "The following signatures were invalid:\n"
 -msgstr "下列的【新】套件都將被安裝："
 +msgstr "下列的簽名皆不合法：\n"
  
 -#: methods/gpgv.cc:250
 +#: methods/gpgv.cc:256
  msgid ""
  "The following signatures couldn't be verified because the public key is not "
  "available:\n"
 -msgstr ""
 +msgstr "由於沒有公鑰，下列簽名無法進行驗證：\n"
  
- #: methods/gzip.cc:64
 -#: methods/gzip.cc:57
++#: methods/gzip.cc:57 methods/gzip.cc:64
  #, c-format
  msgid "Couldn't open pipe for %s"
  msgstr "無法開啟管線給 %s 使用"
  
- #: methods/gzip.cc:109
 -#: methods/gzip.cc:102
++#: methods/gzip.cc:102 methods/gzip.cc:109
  #, c-format
  msgid "Read error from %s process"
  msgstr "從 %s 進程讀取錯誤"
  
--#: methods/http.cc:376
++#: methods/http.cc:375
  msgid "Waiting for headers"
  msgstr "等待標頭"
  
--#: methods/http.cc:522
++#: methods/http.cc:521
  #, c-format
  msgid "Got a single header line over %u chars"
  msgstr "取得一個單行超過 %u 字元的標頭"
  
--#: methods/http.cc:530
++#: methods/http.cc:529
  msgid "Bad header line"
  msgstr "壞的標頭"
  
--#: methods/http.cc:549 methods/http.cc:556
++#: methods/http.cc:548 methods/http.cc:555
  msgid "The HTTP server sent an invalid reply header"
  msgstr "http 伺服器傳送一個無效的回覆標頭"
  
--#: methods/http.cc:585
++#: methods/http.cc:584
  msgid "The HTTP server sent an invalid Content-Length header"
  msgstr "http 伺服器傳送一個無效的 Content-Length 標頭"
  
--#: methods/http.cc:600
++#: methods/http.cc:599
  msgid "The HTTP server sent an invalid Content-Range header"
  msgstr "http 伺服器傳送一個無效的 Content-Range 標頭"
  
--#: methods/http.cc:602
++#: methods/http.cc:601
  msgid "This HTTP server has broken range support"
  msgstr "http 伺服器有損毀的範圍支援"
  
--#: methods/http.cc:626
++#: methods/http.cc:625
  msgid "Unknown date format"
  msgstr "未知的資料格式"
  
--#: methods/http.cc:773
++#: methods/http.cc:772
  msgid "Select failed"
  msgstr "Select 失敗"
  
--#: methods/http.cc:778
++#: methods/http.cc:777
  msgid "Connection timed out"
  msgstr "連線逾時"
  
--#: methods/http.cc:801
++#: methods/http.cc:800
  msgid "Error writing to output file"
  msgstr "寫入輸出檔時發生錯誤"
  
--#: methods/http.cc:832
++#: methods/http.cc:831
  msgid "Error writing to file"
  msgstr "寫入檔案時發生錯誤"
  
--#: methods/http.cc:860
++#: methods/http.cc:859
  msgid "Error writing to the file"
  msgstr "寫入檔案時發生錯誤"
  
--#: methods/http.cc:874
++#: methods/http.cc:873
  msgid "Error reading from server. Remote end closed connection"
  msgstr "從遠端主機讀取錯誤，關閉連線"
  
--#: methods/http.cc:876
++#: methods/http.cc:875
  msgid "Error reading from server"
  msgstr "從伺服器讀取發生錯誤"
  
--#: methods/http.cc:1107
++#: methods/http.cc:1106
  msgid "Bad header data"
  msgstr "壞的標頭資料"
  
--#: methods/http.cc:1124
++#: methods/http.cc:1123
  msgid "Connection failed"
  msgstr "連線失敗"
  
--#: methods/http.cc:1215
++#: methods/http.cc:1214
  msgid "Internal error"
  msgstr "內部錯誤"
  
@@@ -2005,7 -2004,7 +2032,7 @@@ msgstr "不能將空白檔案讀入記æ
  msgid "Couldn't make mmap of %lu bytes"
  msgstr "無法讀入檔案 %lu 位元組至記憶體"
  
--#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr "選項『%s』找不到。"
@@@ -2065,12 -2064,12 +2092,12 @@@ msgstr "語法錯誤 %s:%u: 不支援çš
  msgid "Syntax error %s:%u: Extra junk at end of file"
  msgstr "語法錯誤 %s:%u: 檔案後有多餘的垃圾"
  
--#: apt-pkg/contrib/progress.cc:154
++#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
  #, c-format
  msgid "%c%s... Error!"
  msgstr "%c%s... 錯誤！"
  
--#: apt-pkg/contrib/progress.cc:156
++#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
  #, c-format
  msgid "%c%s... Done"
  msgstr "%c%s... 完成"
@@@ -2202,93 -2201,93 +2229,110 @@@ msgstr "程式刪除檔案
  msgid "Problem syncing the file"
  msgstr "程式同步檔案"
  
--#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
  msgid "Empty package cache"
  msgstr "套件暫存檔是空的。"
  
--#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
  msgid "The package cache file is corrupted"
  msgstr "套件暫存檔損壞。"
  
--#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is an incompatible version"
  msgstr "套件暫存檔版本不符合。"
  
--#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr "本軟體不支持『%s』版本系統。"
  
--#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
  msgid "The package cache was built for a different architecture"
  msgstr "套件暫存檔是在另一種系統上產生的。"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Depends"
  msgstr "依存關係"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "PreDepends"
  msgstr "特別依存關係"
  
--#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
  msgid "Suggests"
  msgstr "建議"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Recommends"
  msgstr "推薦"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Conflicts"
  msgstr "衝突"
  
--#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
  msgid "Replaces"
  msgstr "取代"
  
--#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
  msgid "Obsoletes"
  msgstr "淘汰"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "important"
  msgstr "重要"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "required"
  msgstr "必要"
  
--#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
  msgid "standard"
  msgstr "標準"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "optional"
  msgstr "次要"
  
--#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
  msgid "extra"
  msgstr "添加"
  
--#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
++#: apt-pkg/depcache.cc:127
  msgid "Building dependency tree"
  msgstr "了解套件依存關係中"
  
--#: apt-pkg/depcache.cc:62
++#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
  msgid "Candidate versions"
  msgstr "候選版本"
  
--#: apt-pkg/depcache.cc:91
++#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
  msgid "Dependency generation"
  msgstr "產生套件依存關係"
  
- #: apt-pkg/tagfile.cc:106
 -#: apt-pkg/tagfile.cc:72
++#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
++#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
++#, fuzzy
++msgid "Reading state information"
++msgstr "結合現有資料中"
++
++#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
++#, fuzzy, c-format
++msgid "Failed to open StateFile %s"
++msgstr "無法開啟 %s"
++
++#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
++#, fuzzy, c-format
++msgid "Failed to write temporary StateFile %s"
++msgstr "寫入檔案 %s 失敗"
++
++#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
  #, c-format
  msgid "Unable to parse package file %s (1)"
  msgstr "無法辨識套件『%s』(1)。"
  
- #: apt-pkg/tagfile.cc:193
 -#: apt-pkg/tagfile.cc:102
++#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
  #, c-format
  msgid "Unable to parse package file %s (2)"
  msgstr "無法辨識套件『%s』(1)。"
@@@ -2323,7 -2322,7 +2367,7 @@@ msgstr "來源檔『%2$s』第 %1$lu è¡
  msgid "Opening %s"
  msgstr "開啟『%s』中"
  
--#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "來源檔『%2$s』第 %1$u 行太長。"
@@@ -2334,7 -2333,7 +2378,7 @@@ msgid "Malformed line %u in source lis
  msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (類別)。"
  
  #: apt-pkg/sourcelist.cc:244
 -#, fuzzy, c-format
 +#, c-format
  msgid "Type '%s' is not known on line %u in source list %s"
  msgstr "未知的類別 %1$s 於來源檔 %3$s 第 %2$u 行"
  
@@@ -2358,19 -2357,19 +2402,19 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr "本軟體不支持『%s』型的索引檔。"
  
--#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245
  #, c-format
  msgid ""
  "The package %s needs to be reinstalled, but I can't find an archive for it."
  msgstr "套件『%s』需要重新安裝，但找不到軟件檔案。"
  
--#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
  msgstr "無法解決依存關係。可能原因是某些套件被押後。"
  
--#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077
  msgid "Unable to correct problems, you have held broken packages."
  msgstr "無法解決問題，因為某些損毀的套件被押後。"
  
@@@ -2389,12 -2388,12 +2433,12 @@@ msgstr "找不到『%spartial』檔案ç
  #: apt-pkg/acquire.cc:823
  #, c-format
  msgid "Retrieving file %li of %li (%s remaining)"
 -msgstr ""
 +msgstr "正在下載第 %li 個文件(共 %li 個，尚需 %s)"
  
  #: apt-pkg/acquire.cc:825
 -#, fuzzy, c-format
 +#, c-format
  msgid "Retrieving file %li of %li"
 -msgstr "讀取軟件表中"
 +msgstr "正在下載第%li個檔案(共有%li)"
  
  #: apt-pkg/acquire-worker.cc:113
  #, c-format
@@@ -2407,16 -2406,19 +2451,16 @@@ msgid "Method %s did not start correctl
  msgstr "安裝方式『%s』沒有正確啟動。"
  
  #: apt-pkg/acquire-worker.cc:377
 -#, fuzzy, c-format
 +#, c-format
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 -msgstr ""
 -"更換媒體:請把名為\n"
 -" '%s' 的光碟\n"
 -"插入 '%s' 碟機,然後按 [Enter] 鍵。\n"
 +msgstr "更換媒體：請把名為 '%s' 的光碟置入 '%s' 碟機,然後按 [Enter] 鍵。"
  
--#: apt-pkg/init.cc:120
++#: apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr "本軟體不支持『%s』包裝法。"
  
--#: apt-pkg/init.cc:136
++#: apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr "無法明白系統類別。"
  
@@@ -2450,120 -2452,119 +2494,136 @@@ msgstr "本軟體不支持『%s』型çš
  msgid "No priority (or zero) specified for pin"
  msgstr "對於釘住的檔案無優先順序"
  
--#: apt-pkg/pkgcachegen.cc:74
++#: apt-pkg/pkgcachegen.cc:76
  msgid "Cache has an incompatible versioning system"
  msgstr "套件暫存檔使用的是不相容的版本系統。"
  
--#: apt-pkg/pkgcachegen.cc:117
++#: apt-pkg/pkgcachegen.cc:119
  #, c-format
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr "處理『%s』時發生錯誤 (NewPackage)。"
  
--#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr "處理『%s』時發生錯誤 (UsePackage1)。"
  
--#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:157
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr "處理『%s』時發生錯誤 (NewFileVer1)。"
++
++#: apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr "處理『%s』時發生錯誤 (UsePackage2)。"
  
--#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr "處理『%s』時發生錯誤 (NewFileVer1)。"
  
--#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr "處理『%s』時發生錯誤 (NewVersion1)。"
  
--#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr "處理『%s』時發生錯誤 (UsePackage3)。"
  
--#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr "處理『%s』時發生錯誤 (NewVersion2)。"
  
--#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:249
++#, fuzzy, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr "處理『%s』時發生錯誤 (NewFileVer1)。"
++
++#: apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr "套件數量超過本程式的能力。"
  
--#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr "套件版本數量超過本程式的能力。"
  
--#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:261
++#, fuzzy
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr "套件版本數量超過本程式的能力。"
++
++#: apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr "依存關係數量超過本程式的能力。"
  
--#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr "處理『%s』時發生錯誤 (FindPkg)。"
  
--#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr "處理『%s』時發生錯誤 (CollectFileProvides)。"
  
--#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr "當計算相依性時找不到套件 %s %s "
  
--#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:681
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr "無法讀取來源檔『%s』的目錄資料。"
  
--#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:765
  msgid "Collecting File Provides"
  msgstr "收集檔案供應"
  
--#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
  msgid "IO Error saving source cache"
  msgstr "無法寫入來源暫存檔。"
  
--#: apt-pkg/acquire-item.cc:126
++#: apt-pkg/acquire-item.cc:130
  #, c-format
  msgid "rename failed, %s (%s -> %s)."
  msgstr "檔名因『%s』更換失敗 (%s → %s)。"
  
--#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
++#: apt-pkg/acquire-item.cc:1402
  msgid "MD5Sum mismatch"
  msgstr "MD5 檢查碼不符合。"
  
--#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:1097
 +#, fuzzy
  msgid "There are no public key available for the following key IDs:\n"
 -msgstr ""
 +msgstr "以下 key ID 沒有可用的公鑰：\n"
  
--#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:1210
  #, c-format
  msgid ""
  "I wasn't able to locate a file for the %s package. This might mean you need "
  "to manually fix this package. (due to missing arch)"
  msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
  
--#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:1269
  #, c-format
  msgid ""
  "I wasn't able to locate file for the %s package. This might mean you need to "
  "manually fix this package."
  msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
  
--#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:1305
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。"
  
--#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:1392
  msgid "Size mismatch"
  msgstr "檔案大小不符合。"
  
@@@ -2572,7 -2573,7 +2632,7 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr "廠商區段%s有錯誤。"
  
--#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
@@@ -2581,47 -2582,47 +2641,49 @@@ msgstr "
  "使用光碟機掛載點 %s\n"
  "掛載光碟機中\n"
  
--#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr "標識中.."
  
--#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr "保存標誌：%s \n"
  
--#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr "使用光碟機掛載點 %s\n"
  
--#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr "卸載光碟機中\n"
  
--#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr "等待磁碟中...\n"
  
  #. Mount the new CDROM
--#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr "掛載光碟機中... \n"
  
--#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr "掃描碟片中的索引檔案..\n"
  
--#: apt-pkg/cdrom.cc:647
--#, c-format
--msgid "Found %i package indexes, %i source indexes and %i signatures\n"
++#: apt-pkg/cdrom.cc:673
++#, fuzzy, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
  msgstr "找到 %i 個套件索引，%i 源碼索引和 %i 簽名\n"
  
--#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr "這不是合法名稱，重試一下。\n"
  
--#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
@@@ -2630,103 -2631,117 +2692,109 @@@ msgstr "
  "這個碟片名為：\n"
  "'%s'\n"
  
--#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr "複製套件清單中"
  
--#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr "寫入新的來源列表中\n"
  
--#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr "該碟片的來源列表項目為：\n"
  
--#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr "卸載光碟機中..."
  
--#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr "寫入 %i 筆紀錄。\n"
  
--#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr "寫入 %i 筆遺失 %i 個檔案的紀錄。\n"
  
--#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr "寫入 %i 筆 %i 個不匹配檔案的紀錄。\n"
  
--#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr "寫入 %i 筆遺失 %i 個檔案和 %i 個不匹配檔案的紀錄。\n"
  
  #: apt-pkg/deb/dpkgpm.cc:358
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing %s"
 -msgstr "開啟『%s』中"
 +msgstr "準備配置%s中"
  
  #: apt-pkg/deb/dpkgpm.cc:359
 -#, fuzzy, c-format
 +#, c-format
  msgid "Unpacking %s"
 -msgstr "開啟『%s』中"
 +msgstr "解開%s中"
  
  #: apt-pkg/deb/dpkgpm.cc:364
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing to configure %s"
 -msgstr "開啟組態檔 %s"
 +msgstr "準備設定%s檔"
  
  #: apt-pkg/deb/dpkgpm.cc:365
 -#, fuzzy, c-format
 +#, c-format
  msgid "Configuring %s"
 -msgstr "聯絡主機『%s』中"
 +msgstr "設定%s中"
  
  #: apt-pkg/deb/dpkgpm.cc:366
 -#, fuzzy, c-format
 +#, c-format
  msgid "Installed %s"
 -msgstr "已安裝:"
 +msgstr "已安裝%s"
  
  #: apt-pkg/deb/dpkgpm.cc:371
  #, c-format
  msgid "Preparing for removal of %s"
 -msgstr ""
 +msgstr "正在準備 %s 的刪除操作"
  
  #: apt-pkg/deb/dpkgpm.cc:372
 -#, fuzzy, c-format
 +#, c-format
  msgid "Removing %s"
 -msgstr "開啟『%s』中"
 +msgstr "移除%s中"
  
  #: apt-pkg/deb/dpkgpm.cc:373
 -#, fuzzy, c-format
 +#, c-format
  msgid "Removed %s"
 -msgstr "推薦"
 +msgstr "已移除%s"
  
  #: apt-pkg/deb/dpkgpm.cc:378
 -#, fuzzy, c-format
 +#, c-format
  msgid "Preparing to completely remove %s"
 -msgstr "開啟組態檔 %s"
 +msgstr "準備完整移除 %s"
  
  #: apt-pkg/deb/dpkgpm.cc:379
 -#, fuzzy, c-format
 +#, c-format
  msgid "Completely removed %s"
 -msgstr "無法移除 %s"
 +msgstr "已完整移除%s"
 +
++#: methods/rred.cc:219
++#, fuzzy
++msgid "Could not patch file"
++msgstr "無法開啟『%s』檔案。"
+ 
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "連線不預期的結束"
  
 -#: ftparchive/cachedb.cc:76
 -msgid ""
 -"DB format is invalid. If you upgraded from a older version of apt, please "
 -"remove and re-create the database."
 -msgstr ""
 -
 -#: ftparchive/writer.cc:623
 -#, fuzzy, c-format
 -msgid "  %s has no source override entry\n"
 -msgstr "  %s 無 override 項目\n"
 -
 -#: ftparchive/writer.cc:627
 -#, fuzzy, c-format
 -msgid "  %s has no binary override entry either\n"
 -msgstr "  %s 無 override 項目\n"
 -
 -#: methods/rred.cc:219
++#: apt-pkg/acquire-item.cc:1097
+ #, fuzzy
 -msgid "Could not patch file"
 -msgstr "無法開啟『%s』檔案。"
++msgid "There is no public key available for the following key IDs:\n"
++msgstr "以下 key ID 沒有可用的公鑰：\n"
++
 +#~ msgid "File date has changed %s"
 +#~ msgstr "檔案資料已更改 %s"
  
- #, fuzzy
- #~ msgid "Could not patch file"
- #~ msgstr "無法開啟『%s』檔案。"
- 
  #~ msgid "Reading file list"
  #~ msgstr "讀取軟件表中"